PR918: java applet windows uses a low resulution black/white icon

2012-04-19  Omair Majid  <[email protected]>

    * NEWS: Update with fix.
    * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Remove windowIcon.
    (initialize): Do not call loadWindowIcon.
    (getWindowIcon): Remove.
    (setWindowIcon): Remove.
    (loadWindowIcon): Remove.
    * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
    (checkTopLevelWindow): Do not set the icon for all top level windows. Use
    the default java icon instead.
    * netx/net/sourceforge/jnlp/util/ImageResources.java: New file. Provides
    access to icons.
    * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (JNLPSplashScreen),
    * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
    (getListener),
    * netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java
    (AdvancedProxySettingsDialog),
    * netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java (CacheViewer),
    * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java (ControlPanel),
    * netx/net/sourceforge/jnlp/security/SecurityDialog.java (SecurityDialog),
    * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java
    (CertificateViewer),
    * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java (show),
    * plugin/icedteanp/java/sun/applet/JavaConsole.java (initialize):
    Explicitly load icons.
    * tests/netx/unit/net/sourceforge/jnlp/util/ImageResourcesTest.java: Test
    for ImageResources class.

1 files changed, 0 insertions, 40 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
index 3e70fe1..ec97300 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
@@ -94,9 +94,6 @@ public class JNLPRuntime {
     /** update policy that controls when to check for updates */
     private static UpdatePolicy updatePolicy = UpdatePolicy.ALWAYS;
 
-    /** netx window icon */
-    private static Image windowIcon = null;
-
     /** whether initialized */
     private static boolean initialized = false;
 
@@ -188,9 +185,6 @@ public class JNLPRuntime {
         if (headless == false)
             checkHeadless();
 
-        if (!headless && windowIcon == null)
-            loadWindowIcon();
-
         if (!headless && indicator == null)
             indicator = new DefaultDownloadIndicator();
 
@@ -336,24 +330,6 @@ public class JNLPRuntime {
     }
 
     /**
-     * Returns the window icon.
-     */
-    public static Image getWindowIcon() {
-        return windowIcon;
-    }
-
-    /**
-     * Sets the window icon that is displayed in Java applications
-     * and applets instead of the default Java icon.
-     *
-     * @throws IllegalStateException if caller is not the exit class
-     */
-    public static void setWindowIcon(Image image) {
-        checkExitClass();
-        windowIcon = image;
-    }
-
-    /**
      * Returns whether the JNLP client will use any AWT/Swing
      * components.
      */
@@ -622,22 +598,6 @@ public class JNLPRuntime {
     }
 
     /**
-     * Load the window icon.
-     */
-    private static void loadWindowIcon() {
-        if (windowIcon != null)
-            return;
-
-        try {
-            windowIcon = new javax.swing.ImageIcon((new sun.misc.Launcher())
-                        .getClassLoader().getResource("net/sourceforge/jnlp/resources/netx-icon.png")).getImage();
-        } catch (Exception ex) {
-            if (JNLPRuntime.isDebug())
-                ex.printStackTrace();
-        }
-    }
-
-    /**
      * @return true if running on Windows
      */
     public static boolean isWindows() {