4222508: JColorChooser ignores setEnabled() function call

Reviewed-by: peterz, rupashka

4222508: JColorChooser ignores setEnabled() function call
Reviewed-by: peterz, rupashka
950b0a98 · malenkov · de0f2e09 · 950b0a98 · 950b0a98 · 950b0a98
5 changed file
--- a/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -26,6 +26,8 @@
 package javax.swing.colorchooser;
 import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import javax.swing.*;
 /**
@@ -47,6 +49,15 @@ import javax.swing.*;
 */
 public abstract class AbstractColorChooserPanel extends JPanel {
+    private final PropertyChangeListener enabledListener = new PropertyChangeListener() {
+        public void propertyChange(PropertyChangeEvent event) {
+            Object value = event.getNewValue();
+            if (value instanceof Boolean) {
+                setEnabled((Boolean) value);
+            }
+        }
+    };
    /**
     *
     */
@@ -142,6 +153,8 @@ public abstract class AbstractColorChooserPanel extends JPanel {
            throw new RuntimeException ("This chooser panel is already installed");
        }
        chooser = enclosingChooser;
+        chooser.addPropertyChangeListener("enabled", enabledListener);
+        setEnabled(chooser.isEnabled());
        buildChooser();
        updateChooser();
    }
@@ -151,6 +164,7 @@ public abstract class AbstractColorChooserPanel extends JPanel {
     * If override this, be sure to call <code>super</code>.
     */
  public void uninstallChooserPanel(JColorChooser enclosingChooser) {
+        chooser.removePropertyChangeListener("enabled", enabledListener);
        chooser = null;
    }

--- a/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
+++ b/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
@@ -26,6 +26,8 @@
 package javax.swing.colorchooser;
 import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeEvent;
@@ -56,6 +58,21 @@ final class ColorChooserPanel extends AbstractColorChooserPanel implements Prope
        ValueFormatter.init(6, true, this.text);
    }
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        setEnabled(this, enabled);
+    }
+    private static void setEnabled(Container container, boolean enabled) {
+        for (Component component : container.getComponents()) {
+            component.setEnabled(enabled);
+            if (component instanceof Container) {
+                setEnabled((Container) component, enabled);
+            }
+        }
+    }
    @Override
    public void updateChooser() {
        Color color = getColorFromModel();

--- a/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
@@ -170,7 +170,6 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel {
        superHolder.add(mainHolder, gbc);
        gbc.insets = oldInsets;
-        recentSwatchPanel.addMouseListener(recentSwatchListener);
        recentSwatchPanel.setInheritsPopupMenu(true);
        JPanel recentHolder = new JPanel( new BorderLayout() );
        recentHolder.setBorder(border);
@@ -212,18 +211,22 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel {
    class RecentSwatchListener extends MouseAdapter implements Serializable {
        public void mousePressed(MouseEvent e) {
+            if (isEnabled()) {
                Color color = recentSwatchPanel.getColorForLocation(e.getX(), e.getY());
                setSelectedColor(color);
            }
        }
+    }
    class MainSwatchListener extends MouseAdapter implements Serializable {
        public void mousePressed(MouseEvent e) {
+            if (isEnabled()) {
                Color color = swatchPanel.getColorForLocation(e.getX(), e.getY());
                setSelectedColor(color);
                recentSwatchPanel.setMostRecentColor(color);
            }
        }
+    }
 }

--- a/test/javax/swing/JColorChooser/Test4222508.html
+++ b/test/javax/swing/JColorChooser/Test4222508.html
+<html>
+<body>
+Use the check box above the color chooser to disable it.
+You could not choose a color using by the disable color chooser.
+<applet width="600" height="400" code="Test4222508.class">
+</applet>
+</body>
+</html>
--- a/test/javax/swing/JColorChooser/Test4222508.java
+++ b/test/javax/swing/JColorChooser/Test4222508.java
+/*
+ * Copyright 2008 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 4222508
+ * @summary Tests the color chooser disabling
+ * @author Sergey Malenkov
+ * @run applet/manual=yesno Test4222508.html
+ */
+import java.awt.BorderLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import javax.swing.JApplet;
+import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
+public final class Test4222508 extends JApplet implements ItemListener {
+    private JCheckBox checkbox;
+    private JColorChooser chooser;
+    @Override
+    public void init() {
+        this.chooser = new JColorChooser();
+        this.checkbox = new JCheckBox("Enable the color chooser below", true);
+        this.checkbox.addItemListener(this);
+        add(BorderLayout.NORTH, this.checkbox);
+        add(BorderLayout.CENTER, this.chooser);
+    }
+    public void itemStateChanged(ItemEvent event) {
+        this.chooser.setEnabled(this.checkbox.isSelected());
+    }
+}