From 5e403e636e5ddea669f12019555f8392157e67c1 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 30 Aug 2013 10:56:59 -0400 Subject: PR1058: XFileOpenService openMultiFileDialog ClassCastException Instead of trying to create a privileged proxy for the FileContents[] array, simply create a privileged proxy for each FileContents instance and return an array of them. 2013-08-29 Omair Majid PR1058 * netx/net/sourceforge/jnlp/services/XFileOpenService.java (openMultiFileDialog): Create a privileged proxy for each FileContents instance and return an array of them. --- netx/net/sourceforge/jnlp/services/XFileOpenService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'netx/net/sourceforge') diff --git a/netx/net/sourceforge/jnlp/services/XFileOpenService.java b/netx/net/sourceforge/jnlp/services/XFileOpenService.java index 7e004e3..ac5c162 100644 --- a/netx/net/sourceforge/jnlp/services/XFileOpenService.java +++ b/netx/net/sourceforge/jnlp/services/XFileOpenService.java @@ -91,11 +91,12 @@ class XFileOpenService implements FileOpenService { if (chosen == JFileChooser.APPROVE_OPTION) { File[] files = chooser.getSelectedFiles(); int length = files.length; - XFileContents[] xfiles = new XFileContents[length]; - for (int i = 0; i < length; i++) - xfiles[i] = new XFileContents(files[i]); - return (FileContents[]) ServiceUtil.createPrivilegedProxy( - FileContents.class, xfiles); + FileContents[] result = new FileContents[length]; + for (int i = 0; i < length; i++) { + XFileContents xfile = new XFileContents(files[i]); + result[i] = (FileContents) ServiceUtil.createPrivilegedProxy(FileContents.class, xfile); + } + return result; } else { return null; } -- cgit v1.2.3 From 954a988dde49b5ee6f154ddebbf7459341ccab1a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 4 Sep 2013 10:35:39 +0200 Subject: netx/net/sourceforge/jnlp/Launcher.java - Fix applet context being null during applet init & start, by Adam Domurad --- ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/Launcher.java | 2 ++ 2 files changed, 7 insertions(+) (limited to 'netx/net/sourceforge') diff --git a/ChangeLog b/ChangeLog index 441a780..269042e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-04 Adam Domurad + + * netx/net/sourceforge/jnlp/Launcher.java: + Fix applet context being null during applet init & start. + 2013-08-29 Omair Majid * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java diff --git a/netx/net/sourceforge/jnlp/Launcher.java b/netx/net/sourceforge/jnlp/Launcher.java index c214846..8190945 100644 --- a/netx/net/sourceforge/jnlp/Launcher.java +++ b/netx/net/sourceforge/jnlp/Launcher.java @@ -19,6 +19,7 @@ package net.sourceforge.jnlp; import static net.sourceforge.jnlp.runtime.Translator.R; import java.applet.Applet; +import java.applet.AppletStub; import java.awt.Container; import java.awt.SplashScreen; import java.io.File; @@ -716,6 +717,7 @@ public class Launcher { String appletName = file.getApplet().getMainClass(); Class appletClass = loader.loadClass(appletName); Applet applet = (Applet) appletClass.newInstance(); + applet.setStub((AppletStub)cont); // Finish setting up appletInstance. appletInstance.setApplet(applet); appletInstance.getAppletEnvironment().setApplet(applet); -- cgit v1.2.3