File icedtea-web-1.6.1-doInit.patch of Package icedtea-web

Overview Repositories Revisions Requests Users Attributes Meta

File icedtea-web-1.6.1-doInit.patch of Package icedtea-web (Revision 5f3a5c6196a190de83c0a176a5c1a879)

Currently displaying revision 5f3a5c6196a190de83c0a176a5c1a879 , Show latest

--- icedtea-web-1.6.1/netx/net/sourceforge/jnlp/NetxPanel.java	2015-09-11 15:02:04.270280337 +0200
+++ icedtea-web-1.6.1/netx/net/sourceforge/jnlp/NetxPanel.java	2015-10-27 09:08:17.251613720 +0100
@@ -204,7 +204,7 @@
     }
 
     public void init(PluginBridge bridge) throws LaunchException {
-        doInit = true;
+        setDoInitIfExists(true);
         dispatchAppletEvent(APPLET_LOADING, null);
         status = APPLET_LOAD;
 
--- icedtea-web-1.6.1/netx/sun/applet/AppletViewerPanelAccess.java	Tue Oct 27 14:13:23 2015 +0100
+++ icedtea-web-1.6.1/netx/sun/applet/AppletViewerPanelAccess.java	Tue Nov 03 14:06:31 2015 +0100
@@ -41,6 +41,7 @@
 import java.util.Hashtable;
 import java.util.Map;
 import net.sourceforge.jnlp.NetxPanel;
+import net.sourceforge.jnlp.util.logging.OutputController;
 
 public abstract class AppletViewerPanelAccess extends AppletViewerPanel {
 
@@ -132,4 +133,36 @@
 
     abstract protected void ourRunLoader();
 
+    /**
+     * jdk9 removed doInit.
+     * http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/2b680924a73f This is way how
+     * to set it in older jdks and still compile on jdk9+
+     *
+     * @param a value to set to doInit if it exists
+     */
+    protected void setDoInitIfExists(boolean a) {
+        //doInit = a;
+        try {
+            Class c = this.getClass();
+            Field fs = null;
+            while (c != null) {
+                if (AppletPanel.class.equals(c)) {
+                    fs = c.getDeclaredField("doInit");
+                    break;
+                }
+                //known location is NetxPanel->AppeltViwerPannelAccess->AppletViwerPanel->AppletPanel
+                c = c.getSuperclass();
+            }
+            if (fs == null) {
+                throw new NoSuchFieldException("AppletPanel not found.");
+            }
+            fs.setAccessible(true);
+            fs.set(this, a);
+        } catch (IllegalAccessException | IllegalArgumentException | NoSuchFieldException | SecurityException ex) {
+            OutputController.getLogger().log("Can't get/set doInit. Runing on JDK9 or higher?");
+            OutputController.getLogger().log(ex);
+        }
+
+    }
+
 }

Places

File icedtea-web-1.6.1-doInit.patch of Package icedtea-web (Revision 5f3a5c6196a190de83c0a176a5c1a879)

Places