changeset 6459:7dd1896b37c8

6817933: Setting the background of an HTML Widget changes the native Windows JFileChooser Reviewed-by: alexsch
author malenkov
date Thu, 24 Jan 2013 17:26:32 +0400
parents fab11b21ee6e
children f8526b99b825
files src/share/classes/sun/swing/WindowsPlacesBar.java test/javax/swing/JFileChooser/6817933/Test6817933.java
diffstat 2 files changed, 122 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/swing/WindowsPlacesBar.java	Thu Jan 24 16:09:48 2013 +0400
+++ b/src/share/classes/sun/swing/WindowsPlacesBar.java	Thu Jan 24 17:26:32 2013 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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
@@ -116,9 +116,6 @@
                 icon = fsv.getSystemIcon(files[i]);
             }
             buttons[i] = new JToggleButton(folderName, icon);
-            if (isXPPlatform) {
-                buttons[i].setText("<html><center>"+folderName+"</center></html>");
-            }
             if (isXPStyle) {
                 buttons[i].putClientProperty("XPStyle.subAppName", "placesbar");
             } else {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JFileChooser/6817933/Test6817933.java	Thu Jan 24 17:26:32 2013 +0400
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6817933
+ * @summary Tests that HTMLEditorKit does not affect JFileChooser
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+
+import sun.awt.SunToolkit;
+import sun.swing.WindowsPlacesBar;
+
+public class Test6817933 {
+
+    private static final String STYLE = "BODY {background:red}";
+    private static final Color COLOR = Color.RED;
+    private static JFileChooser chooser;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        }
+        catch (Exception exception) {
+            exception.printStackTrace();
+            return; // ignore test on non-Windows machines
+        }
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                StyleSheet css = new StyleSheet();
+                css.addRule(STYLE);
+
+                HTMLEditorKit kit = new HTMLEditorKit();
+                kit.setStyleSheet(css);
+
+                JFrame frame = new JFrame(STYLE);
+                frame.add(chooser = new JFileChooser());
+                frame.setSize(640, 480);
+                frame.setVisible(true);
+            }
+        });
+
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        toolkit.realSync(500);
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                try {
+                    JToggleButton button = get(JToggleButton.class,
+                                           get(WindowsPlacesBar.class, chooser));
+
+                    int width = button.getWidth();
+                    int height = button.getHeight() / 3;
+                    Point point = new Point(0, height * 2);
+                    SwingUtilities.convertPointToScreen(point, button);
+                    width += point.x;
+                    height += point.y;
+
+                    int count = 0;
+                    Robot robot = new Robot();
+                    for (int x = point.x; x < width; x++) {
+                        for (int y = point.y; y < height; y++) {
+                            count += COLOR.equals(robot.getPixelColor(x, y)) ? -2 : 1;
+                        }
+                    }
+                    if (count < 0) {
+                        throw new Exception("TEST ERROR: a lot of red pixels");
+                    }
+                }
+                catch (Exception exception) {
+                    throw new Error(exception);
+                }
+                finally {
+                    SwingUtilities.getWindowAncestor(chooser).dispose();
+                }
+            }
+        });
+    }
+
+    private static <T> T get(Class<? extends T> type, Container container) {
+        Component component = container.getComponent(0);
+        if (!type.isAssignableFrom(component.getClass())) {
+            throw new IllegalStateException("expected " + type + "; expected " + component.getClass());
+        }
+        return (T) component;
+    }
+}