/hg/icedtea-web: 4 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue Oct 26 15:16:44 PDT 2010
changeset 9a6efc86f5c1 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9a6efc86f5c1
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 26 17:52:03 2010 -0400
overload a new R method for translation of simple strings
2010-10-26 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/runtime/Translator.java
(R(String)): New method.
changeset 9aa450ca3d99 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9aa450ca3d99
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 26 17:56:41 2010 -0400
add more JNLP spec numbers as supported versions
2010-10-26 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/Parser.java: Add 1.1, 1.2, 1.3 and
1.4 to supportedVersions.
changeset a3941697dcdd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a3941697dcdd
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 26 18:00:35 2010 -0400
launch applications that have a non-public main class
2010-10-26 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/Launcher.java
(launchApplication): Mark main method as accessible before
invoking it.
changeset 33f17695e034 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=33f17695e034
author: Omair Majid <omajid at redhat.com>
date: Tue Oct 26 18:14:11 2010 -0400
Fix possible null dtd in Swing applications
2010-10-26 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/Launcher.java
(doPerApplicationAppContextHacks): New method. Create a new
ParserDelegate to intialize the per AppContext dtd used by Swing
HTML controls. (TgThread.run): Call
doPerApplicationAppContextHacks.
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
Call doMainAppContextHacks. (doMainAppContextHacks): New method.
Create a new ParserDelegate to initialize the per AppContext dtd
used by Swing HTML controls.
diffstat:
5 files changed, 77 insertions(+), 1 deletion(-)
ChangeLog | 27 ++++++++++++++++++++
netx/net/sourceforge/jnlp/Launcher.java | 20 ++++++++++++++
netx/net/sourceforge/jnlp/Parser.java | 2 -
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 20 ++++++++++++++
netx/net/sourceforge/jnlp/runtime/Translator.java | 9 ++++++
diffs (158 lines):
diff -r 98887d964b0e -r 33f17695e034 ChangeLog
--- a/ChangeLog Tue Oct 26 18:08:09 2010 -0700
+++ b/ChangeLog Tue Oct 26 18:14:11 2010 -0400
@@ -1,3 +1,30 @@ 2010-10-26 Deepak Bhole <dbhole at redhat.
+2010-10-26 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/Launcher.java
+ (doPerApplicationAppContextHacks): New method. Create a new ParserDelegate
+ to intialize the per AppContext dtd used by Swing HTML controls.
+ (TgThread.run): Call doPerApplicationAppContextHacks.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+ (initialize): Call doMainAppContextHacks.
+ (doMainAppContextHacks): New method. Create a new ParserDelegate to
+ initialize the per AppContext dtd used by Swing HTML controls.
+
+2010-10-26 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/Launcher.java
+ (launchApplication): Mark main method as accessible before
+ invoking it.
+
+2010-10-26 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/Parser.java: Add 1.1, 1.2, 1.3 and
+ 1.4 to supportedVersions.
+
+2010-10-26 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/Translator.java
+ (R(String)): New method.
+
2010-10-26 Deepak Bhole <dbhole at redhat.com>
* netx/net/sourceforge/jnlp/PluginBridge.java: Trim whitespace from jar
diff -r 98887d964b0e -r 33f17695e034 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Tue Oct 26 18:08:09 2010 -0700
+++ b/netx/net/sourceforge/jnlp/Launcher.java Tue Oct 26 18:14:11 2010 -0400
@@ -50,6 +50,7 @@ import net.sourceforge.jnlp.util.Reflect
import net.sourceforge.jnlp.util.Reflect;
import javax.swing.SwingUtilities;
+import javax.swing.text.html.parser.ParserDelegator;
import sun.awt.SunToolkit;
@@ -474,6 +475,7 @@ public class Launcher {
splashScreen.dispose();
}
+ main.setAccessible(true);
main.invoke(null, new Object[] { args } );
return app;
@@ -778,6 +780,22 @@ public class Launcher {
}
}
+ /**
+ * Do hacks on per-application level to allow different AppContexts to work
+ *
+ * @see JNLPRuntime#doMainAppContextHacks
+ */
+ private static void doPerApplicationAppContextHacks() {
+
+ /*
+ * With OpenJDK6 (but not with 7) a per-AppContext dtd is maintained.
+ * This dtd is created by the ParserDelgate. However, the code in
+ * HTMLEditorKit (used to render HTML in labels and textpanes) creates
+ * the ParserDelegate only if there are no existing ParserDelegates. The
+ * result is that all other AppContexts see a null dtd.
+ */
+ new ParserDelegator();
+ }
/**
* This runnable is used to call the appropriate launch method
@@ -815,6 +833,8 @@ public class Launcher {
if (context && !isPlugin)
SunToolkit.createNewAppContext();
+ doPerApplicationAppContextHacks();
+
if (isPlugin) {
// Do not display download indicators if we're using gcjwebplugin.
JNLPRuntime.setDefaultDownloadIndicator(null);
diff -r 98887d964b0e -r 33f17695e034 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Tue Oct 26 18:08:09 2010 -0700
+++ b/netx/net/sourceforge/jnlp/Parser.java Tue Oct 26 18:14:11 2010 -0400
@@ -68,7 +68,7 @@ class Parser {
/** the supported JNLP file versions */
- private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0");
+ private static Version supportedVersions = new Version("1.0 1.1 1.2 1.3 1.4 1.5 1.6 6.0");
// fix: some descriptors need to use the jnlp file at a later
// date and having file ref lets us pass it to their
diff -r 98887d964b0e -r 33f17695e034 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Oct 26 18:08:09 2010 -0700
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Oct 26 18:14:11 2010 -0400
@@ -27,6 +27,7 @@ import javax.jnlp.*;
import javax.jnlp.*;
import javax.naming.ConfigurationException;
import javax.swing.UIManager;
+import javax.swing.text.html.parser.ParserDelegator;
import net.sourceforge.jnlp.*;
import net.sourceforge.jnlp.cache.*;
@@ -232,6 +233,8 @@ public class JNLPRuntime {
// ignore it
}
+ doMainAppContextHacks();
+
if (securityEnabled) {
Policy.setPolicy(policy); // do first b/c our SM blocks setPolicy
System.setSecurityManager(security);
@@ -258,6 +261,23 @@ public class JNLPRuntime {
securityThread.setDaemon(true);
securityThread.start();
return runner;
+ }
+
+ /**
+ * Performs a few hacks that are needed for the main AppContext
+ *
+ * @see Launcher#doPerApplicationAppContextHacks
+ */
+ private static void doMainAppContextHacks() {
+
+ /*
+ * With OpenJDK6 (but not with 7) a per-AppContext dtd is maintained.
+ * This dtd is created by the ParserDelgate. However, the code in
+ * HTMLEditorKit (used to render HTML in labels and textpanes) creates
+ * the ParserDelegate only if there are no existing ParserDelegates. The
+ * result is that all other AppContexts see a null dtd.
+ */
+ new ParserDelegator();
}
/**
diff -r 98887d964b0e -r 33f17695e034 netx/net/sourceforge/jnlp/runtime/Translator.java
--- a/netx/net/sourceforge/jnlp/runtime/Translator.java Tue Oct 26 18:08:09 2010 -0700
+++ b/netx/net/sourceforge/jnlp/runtime/Translator.java Tue Oct 26 18:14:11 2010 -0400
@@ -28,4 +28,13 @@ public class Translator {
return JNLPRuntime.getMessage(message, params);
}
+ /**
+ * Return a translated (localized) version of the message
+ * @param message the message to translate
+ * @return a string representing the localized message
+ */
+ public static String R(String message) {
+ return JNLPRuntime.getMessage(message);
+ }
+
}
More information about the distro-pkg-dev
mailing list