/hg/release/icedtea-web-1.3: Made it work with OpenJDK build 25 ...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Jun 20 06:27:32 PDT 2013
changeset e5e87b61a02d in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=e5e87b61a02d
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 20 15:27:22 2013 +0200
Made it work with OpenJDK build 25 by creating application as soon as possible
diffstat:
ChangeLog | 10 ++++++++++
netx/net/sourceforge/jnlp/runtime/Boot.java | 5 +++++
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 +-
plugin/icedteanp/java/sun/applet/PluginMain.java | 5 +++++
4 files changed, 21 insertions(+), 1 deletions(-)
diffs (73 lines):
diff -r 3c5e0952d876 -r e5e87b61a02d ChangeLog
--- a/ChangeLog Thu Jun 06 17:09:54 2013 +0200
+++ b/ChangeLog Thu Jun 20 15:27:22 2013 +0200
@@ -1,3 +1,13 @@
+2013-06-20 Jiri Vanek <jvanek at 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-06 Jiri Vanek <jvanek at redhat.com>
Made all tests running wit junit4.10 and higher
diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 06 17:09:54 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Thu Jun 20 15:27:22 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")) {
diff -r 3c5e0952d876 -r e5e87b61a02d netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 06 17:09:54 2013 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Thu Jun 20 15:27:22 2013 +0200
@@ -233,7 +233,7 @@
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception e) {
- // ignore it
+ e.printStackTrace();
}
doMainAppContextHacks();
diff -r 3c5e0952d876 -r e5e87b61a02d plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 06 17:09:54 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Thu Jun 20 15:27:22 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);
More information about the distro-pkg-dev
mailing list