diff options
Diffstat (limited to 'plugin/icedteanp/java/sun/applet/PluginMain.java')
-rw-r--r-- | plugin/icedteanp/java/sun/applet/PluginMain.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/plugin/icedteanp/java/sun/applet/PluginMain.java b/plugin/icedteanp/java/sun/applet/PluginMain.java index 421edb5..32b8ab6 100644 --- a/plugin/icedteanp/java/sun/applet/PluginMain.java +++ b/plugin/icedteanp/java/sun/applet/PluginMain.java @@ -77,14 +77,13 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Map; import java.util.Properties; -import sun.awt.AppContext; -import sun.awt.SunToolkit; +import jogamp.applet.App3Context; +import jogamp.plugin.applet.PluginApplet3Viewer; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.security.JNLPAuthenticator; import net.sourceforge.jnlp.util.logging.JavaConsole; -import net.sourceforge.jnlp.util.logging.LogConfig; import net.sourceforge.jnlp.util.logging.OutputController; /** @@ -127,8 +126,12 @@ public class PluginMain { OutputController.getLogger().log(i + ": "+string); } + /** if (AppContext.getAppContext() == null) { SunToolkit.createNewAppContext(); + } */ + if (App3Context.getAppContext() == null) { + App3Context.createAppContext(); } installDummyJavascriptProtocolHandler(); @@ -152,8 +155,10 @@ public class PluginMain { PluginAppletSecurityContext.setStreamhandler(streamHandler); AppletSecurityContextManager.addContext(0, sc); - PluginAppletViewer.setStreamhandler(streamHandler); - PluginAppletViewer.setPluginCallRequestFactory(new PluginCallRequestFactory()); + // FIXME PluginAppletViewer.setStreamhandler(streamHandler); + // FIXME PluginAppletViewer.setPluginCallRequestFactory(new PluginCallRequestFactory()); + PluginApplet3Viewer.setStreamhandler(streamHandler); // FIXME + PluginApplet3Viewer.setPluginCallRequestFactory(new PluginCallRequestFactory()); // FIXME init(); |