Mercurial > hg > release > icedtea-1.10
changeset 1702:e1583e7a3c72
Fix up merge issue with PluginStreamHandler.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Tue, 03 Mar 2009 22:24:14 +0000 |
parents | f09bd84e1703 |
children | 474e0f80ba58 |
files | plugin/icedtea/sun/applet/PluginStreamHandler.java |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/plugin/icedtea/sun/applet/PluginStreamHandler.java Tue Mar 03 09:31:37 2009 +0000 +++ b/plugin/icedtea/sun/applet/PluginStreamHandler.java Tue Mar 03 22:24:14 2009 +0000 @@ -154,10 +154,6 @@ AppletSecurityContextManager.dumpStore(0); PluginDebug.debug("APPLETVIEWER: exiting appletviewer"); System.exit(0); - } else if (message.equals("showconsole")) { - showConsole(); - } else if (message.equals("hideconsole")) { - hideConsole(); } /* @@ -386,8 +382,11 @@ AppletSecurityContextManager.dumpStore(0); PluginDebug.debug("APPLETVIEWER: exiting appletviewer"); System.exit(0); + } else if (message.equals("showconsole")) { + showConsole(); + } else if (message.equals("hideconsole")) { + hideConsole(); } - } catch (IOException e) { e.printStackTrace(); }