Mercurial > hg > release > icedtea-web-1.4
changeset 746:b1b17bb14ab0
Made it work with OpenJDK build 25 by creating application as soon as possible
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Thu, 20 Jun 2013 15:26:14 +0200 |
parents | adaba1e22d66 |
children | be23db7861a6 |
files | ChangeLog netx/net/sourceforge/jnlp/runtime/Boot.java netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java plugin/icedteanp/java/sun/applet/PluginMain.java |
diffstat | 4 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 07 16:05:13 2013 -0400 +++ b/ChangeLog Thu Jun 20 15:26:14 2013 +0200 @@ -1,3 +1,13 @@ +2013-06-20 Jiri Vanek <jvanek@redhat.com> + + Made it work with OpenJDK build 25 + * netx/net/sourceforge/jnlp/runtime/Boot.java: (main) + Application context created as soon as possible + * plugin/icedteanp/java/sun/applet/PluginMain.java:(main) + Application context created as soon as possible + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Do not consume + exception after setLookAndFeel. + 2013-06-07 Adam Domurad <adomurad@redhat.com> Fix PR1465
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Fri Jun 07 16:05:13 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:26:14 2013 +0200 @@ -35,6 +35,8 @@ import net.sourceforge.jnlp.cache.UpdatePolicy; import net.sourceforge.jnlp.security.viewer.CertificateViewer; import net.sourceforge.jnlp.services.ServiceUtil; +import sun.awt.AppContext; +import sun.awt.SunToolkit; /** * This is the main entry point for the JNLP client. The main @@ -113,6 +115,9 @@ * Launch the JNLP file specified by the command-line arguments. */ public static void main(String[] argsIn) { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } args = argsIn; if (null != getOption("-viewer")) {
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Jun 07 16:05:13 2013 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:26:14 2013 +0200 @@ -234,7 +234,7 @@ try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception e) { - // ignore it + e.printStackTrace(); } doMainAppContextHacks();
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Fri Jun 07 16:05:13 2013 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:26:14 2013 +0200 @@ -72,6 +72,8 @@ import java.net.ProxySelector; import java.util.Enumeration; import java.util.Properties; +import sun.awt.AppContext; +import sun.awt.SunToolkit; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; @@ -94,6 +96,9 @@ */ public static void main(String args[]) throws IOException { + if (AppContext.getAppContext() == null) { + SunToolkit.createNewAppContext(); + } if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("Invalid pipe names provided. Refusing to proceed."); System.exit(1);