diff options
15 files changed, 223 insertions, 46 deletions
@@ -1,3 +1,33 @@ +2012-04-19 Omair Majid <[email protected]> + + PR918: java applet windows uses a low resulution black/white icon + * 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. + 2012-04-18 Jiri Vanek <[email protected]> Allowed signed applets in automatic reproducers tests @@ -14,6 +14,8 @@ New in release 1.3 (2012-XX-XX): * Plugin - PR820: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp - PR895: IcedTea-Web searches for missing classes on each loadClass or findClass +* Common + - PR918: java applet windows uses a low resulution black/white icon New in release 1.2 (2011-XX-XX): * Security updates: diff --git a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java index f360402..867e953 100644 --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java @@ -14,6 +14,7 @@ import javax.swing.JDialog; import net.sourceforge.jnlp.cache.ResourceTracker; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.ImageResources; public class JNLPSplashScreen extends JDialog { @@ -28,6 +29,8 @@ public class JNLPSplashScreen extends JDialog { public JNLPSplashScreen(ResourceTracker resourceTracker, String applicationTitle, String applicationVendor) { + setIconImages(ImageResources.INSTANCE.getApplicationImages()); + // If the JNLP file does not contain any icon images, the splash image // will consist of the application's title and vendor, as taken from the // JNLP file. diff --git a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java index 5457306..8710a6a 100644 --- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java +++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java @@ -28,6 +28,7 @@ import javax.swing.Timer; import javax.jnlp.*; import net.sourceforge.jnlp.runtime.*; +import net.sourceforge.jnlp.util.ImageResources; /** * Show the progress of downloads. @@ -101,6 +102,7 @@ public class DefaultDownloadIndicator implements DownloadIndicator { synchronized (frameMutex) { if (frame == null) { frame = new JFrame(downloading + "..."); + frame.setIconImages(ImageResources.INSTANCE.getApplicationImages()); frame.getContentPane().setLayout(new GridBagLayout()); } diff --git a/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java b/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java index 4feaaac..462bf65 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java +++ b/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java @@ -31,6 +31,7 @@ import javax.swing.JDialog; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.util.ImageResources; /** * This dialog provides a means for user to edit more of the proxy settings. @@ -54,6 +55,8 @@ public class AdvancedProxySettingsDialog extends JDialog { */ public AdvancedProxySettingsDialog(DeploymentConfiguration config) { super((Frame) null, dialogTitle, true); // Don't need a parent. + setIconImages(ImageResources.INSTANCE.getApplicationImages()); + this.config = config; /* Prepare for adding components to dialog box */ diff --git a/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java b/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java index 6771d36..a06165a 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java +++ b/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java @@ -30,6 +30,7 @@ import javax.swing.JDialog; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; +import net.sourceforge.jnlp.util.ImageResources; /** * This class will provide a visual way of viewing cache. @@ -51,6 +52,7 @@ public class CacheViewer extends JDialog { */ public CacheViewer(DeploymentConfiguration config) { super((Frame) null, dialogTitle, true); // Don't need a parent. + setIconImages(ImageResources.INSTANCE.getApplicationImages()); this.config = config; /* Prepare for adding components to dialog box */ diff --git a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java index a023c79..f1eb003 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java @@ -55,6 +55,7 @@ import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.security.KeyStores; import net.sourceforge.jnlp.security.viewer.CertificatePane; +import net.sourceforge.jnlp.util.ImageResources; /** * This is the control panel for Java. It provides a GUI for modifying the @@ -102,6 +103,7 @@ public class ControlPanel extends JFrame { public ControlPanel(DeploymentConfiguration config) { super(); setTitle(Translator.R("CPHead")); + setIconImages(ImageResources.INSTANCE.getApplicationImages()); this.config = config; 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() { diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java index bf39ef5..6842f2c 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java @@ -350,12 +350,6 @@ class JNLPSecurityManager extends AWTSecurityManager { app.addWindow(w); } - // change coffee cup to netx for default icon - if (window instanceof Window) - for (Window w = (Window) window; w != null; w = w.getOwner()) - if (window instanceof Frame) - ((Frame) window).setIconImage(JNLPRuntime.getWindowIcon()); - // todo: set awt.appletWarning to custom message // todo: logo on with glass pane on JFrame/JWindow? diff --git a/netx/net/sourceforge/jnlp/security/SecurityDialog.java b/netx/net/sourceforge/jnlp/security/SecurityDialog.java index 7c1c607..3c11326 100644 --- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java @@ -41,6 +41,7 @@ import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.security.SecurityDialogs.AccessType; import net.sourceforge.jnlp.security.SecurityDialogs.DialogType; +import net.sourceforge.jnlp.util.ImageResources; import java.awt.*; @@ -98,6 +99,7 @@ public class SecurityDialog extends JDialog { SecurityDialog(DialogType dialogType, AccessType accessType, JNLPFile file, CertVerifier JarCertVerifier, X509Certificate cert, Object[] extras) { super(); + setIconImages(ImageResources.INSTANCE.getApplicationImages()); this.dialogType = dialogType; this.accessType = accessType; this.file = file; diff --git a/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java index c497308..2792fb9 100644 --- a/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java @@ -51,6 +51,7 @@ import javax.swing.JDialog; import javax.swing.UIManager; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.ImageResources; public class CertificateViewer extends JDialog { @@ -61,6 +62,7 @@ public class CertificateViewer extends JDialog { public CertificateViewer() { super((Frame) null, dialogTitle, true); + setIconImages(ImageResources.INSTANCE.getApplicationImages()); Container contentPane = getContentPane(); contentPane.setLayout(new BorderLayout()); diff --git a/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java index bf3d250..3966c17 100644 --- a/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java +++ b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java @@ -82,6 +82,7 @@ public class BasicExceptionDialog { JOptionPane optionPane = new JOptionPane(mainPanel, JOptionPane.ERROR_MESSAGE); final JDialog errorDialog = optionPane.createDialog(R("Error")); + errorDialog.setIconImages(ImageResources.INSTANCE.getApplicationImages()); final JPanel quickInfoPanel = new JPanel(); BoxLayout layout = new BoxLayout(quickInfoPanel, BoxLayout.Y_AXIS); diff --git a/netx/net/sourceforge/jnlp/util/ImageResources.java b/netx/net/sourceforge/jnlp/util/ImageResources.java new file mode 100644 index 0000000..0f03ffb --- /dev/null +++ b/netx/net/sourceforge/jnlp/util/ImageResources.java @@ -0,0 +1,101 @@ +/* ImageResources.java + Copyright (C) 2012 Red Hat, Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package net.sourceforge.jnlp.util; + +import java.awt.Image; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.imageio.ImageIO; + +public enum ImageResources { + + INSTANCE; + + private static final String APPLICATION_ICON_PATH = "net/sourceforge/jnlp/resources/netx-icon.png"; + + private final Map<String, Image> cache = new HashMap<String, Image>(); + + private ImageResources() {} + + /* this is for testing ONLY */ + void clearCache() { + cache.clear(); + } + + /** + * Returns an appropriate image, or null if there are errors loading the image. + */ + private Image getApplicationImage() { + if (cache.containsKey(APPLICATION_ICON_PATH)) { + return cache.get(APPLICATION_ICON_PATH); + } + + ClassLoader cl = this.getClass().getClassLoader(); + if (cl == null) { + cl = ClassLoader.getSystemClassLoader(); + } + + InputStream in = cl.getResourceAsStream(APPLICATION_ICON_PATH); + try { + Image image = ImageIO.read(in); + cache.put(APPLICATION_ICON_PATH, image); + return image; + } catch (IOException ioe) { + ioe.printStackTrace(); + return null; + } + } + + /** + * Returns an appropriate image, or null if there are errors loading the image. + */ + public List<Image> getApplicationImages() { + List<Image> images = new ArrayList<Image>(); + Image appImage = getApplicationImage(); + if (appImage != null) { + images.add(appImage); + } + return images; + } + +} diff --git a/plugin/icedteanp/java/sun/applet/JavaConsole.java b/plugin/icedteanp/java/sun/applet/JavaConsole.java index 55c98e3..e3af966 100644 --- a/plugin/icedteanp/java/sun/applet/JavaConsole.java +++ b/plugin/icedteanp/java/sun/applet/JavaConsole.java @@ -65,6 +65,7 @@ import javax.swing.border.TitledBorder; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.util.ImageResources; /** * A simple Java console for IcedTeaPlugin @@ -92,6 +93,7 @@ public class JavaConsole { final String logDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR); consoleWindow = new JFrame("Java Console"); + consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages()); JPanel contentPanel = new JPanel(); contentPanel.setLayout(new GridBagLayout()); diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/ImageResourcesTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/ImageResourcesTest.java new file mode 100644 index 0000000..5591cb1 --- /dev/null +++ b/tests/netx/unit/net/sourceforge/jnlp/util/ImageResourcesTest.java @@ -0,0 +1,71 @@ +/* ImageResourcesTest.java + Copyright (C) 2012 Red Hat, Inc. + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package net.sourceforge.jnlp.util; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.awt.Image; +import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class ImageResourcesTest { + + @Before + public void setUp() { + ImageResources.INSTANCE.clearCache(); + } + + @After + public void tearDown() { + ImageResources.INSTANCE.clearCache(); + } + + @Test + public void testApplicationImages() { + List<Image> images = ImageResources.INSTANCE.getApplicationImages(); + assertNotNull(images); + assertTrue(images.size() > 0); + for (Image image : images) { + assertNotNull(image); + } + } +} |