changeset 2339:1224c1388e86

6933784: NIMBUS: ImageView getNoImageIcon and getLoadingImageIcon returns nulls instead of an icon Reviewed-by: peterz
author rupashka
date Wed, 17 Mar 2010 12:48:21 +0300
parents d86c053ca938
children ac4c8e3bf93f
files src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java test/javax/swing/plaf/synth/Test6933784.java
diffstat 2 files changed, 84 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Mon Mar 15 16:16:06 2010 +0300
+++ b/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Wed Mar 17 12:48:21 2010 +0300
@@ -648,6 +648,14 @@
         table.put("ColorChooser.swatchesDefaultRecentColor", Color.RED);
         table.put("ColorChooser.swatchesSwatchSize", new Dimension(10, 10));
 
+        // These need to be defined for ImageView.
+        table.put("html.pendingImage", SwingUtilities2.makeIcon(getClass(),
+                                BasicLookAndFeel.class,
+                                "icons/image-delayed.png"));
+        table.put("html.missingImage", SwingUtilities2.makeIcon(getClass(),
+                                BasicLookAndFeel.class,
+                                "icons/image-failed.png"));
+
         // These are needed for PopupMenu.
         table.put("PopupMenu.selectedWindowInputMapBindings", new Object[] {
                   "ESCAPE", "cancel",
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/plaf/synth/Test6933784.java	Wed Mar 17 12:48:21 2010 +0300
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @bug 6933784
+   @summary NIMBUS: ImageView getNoImageIcon and getLoadingImageIcon returns nulls instead of an icon
+   @author Pavel Porvatov
+   @run main Test6933784
+*/
+
+import javax.swing.*;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+import javax.swing.plaf.synth.SynthLookAndFeel;
+import javax.swing.text.Element;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.ImageView;
+import java.io.StringReader;
+
+public class Test6933784 {
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel(new SynthLookAndFeel());
+
+        checkImages();
+
+        UIManager.setLookAndFeel(new NimbusLookAndFeel());
+
+        checkImages();
+    }
+
+    private static void checkImages() throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                HTMLEditorKit c = new HTMLEditorKit();
+                HTMLDocument doc = new HTMLDocument();
+
+                try {
+                    c.read(new StringReader("<HTML><TITLE>Test</TITLE><BODY><IMG id=test></BODY></HTML>"), doc, 0);
+                } catch (Exception e) {
+                    throw new RuntimeException("The test failed", e);
+                }
+
+                Element elem = doc.getElement("test");
+                ImageView iv = new ImageView(elem);
+
+                if (iv.getLoadingImageIcon() == null) {
+                    throw new RuntimeException("getLoadingImageIcon returns null");
+                }
+
+                if (iv.getNoImageIcon() == null) {
+                    throw new RuntimeException("getNoImageIcon returns null");
+                }
+            }
+        });
+    }
+}