From 5fe07b36d9eb296661692d903ed0b9b5afefba0f Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Tue, 2 Jul 2024 03:39:43 +0000 Subject: [PATCH] 5021949: JSplitPane setEnabled(false) shouldn't be partially functional Reviewed-by: abhiscxk, achung, aivanov --- .../share/classes/javax/swing/JSplitPane.java | 14 ++- .../plaf/basic/BasicSplitPaneDivider.java | 16 +++ .../JSplitPane/TestSplitPaneEnableTest.java | 109 ++++++++++++++++++ 3 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 test/jdk/javax/swing/JSplitPane/TestSplitPaneEnableTest.java diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java index 14f62565d40..7d4482af07e 100644 --- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java +++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, 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 @@ -41,6 +41,7 @@ import javax.accessibility.AccessibleState; import javax.accessibility.AccessibleStateSet; import javax.accessibility.AccessibleValue; import javax.swing.plaf.SplitPaneUI; +import javax.swing.plaf.basic.BasicSplitPaneUI; /** * JSplitPane is used to divide two (and only two) @@ -361,6 +362,17 @@ public class JSplitPane extends JComponent implements Accessible } + /** + * {@inheritDoc} + * @param enabled {@inheritDoc} + */ + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + if (this.getUI() instanceof BasicSplitPaneUI) { + ((BasicSplitPaneUI)(this.getUI())).getDivider().setEnabled(enabled); + } + } /** * Sets the L&F object that renders this component. diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java index 3018de4fd93..188e6753887 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java @@ -360,6 +360,20 @@ public class BasicSplitPaneDivider extends Container } } + /** + * {@inheritDoc} + * @param enabled {@inheritDoc} + */ + @Override + public void setEnabled(boolean enabled) { + if (splitPane.isOneTouchExpandable() && + rightButton != null && + leftButton != null) { + + rightButton.setEnabled(enabled); + leftButton.setEnabled(enabled); + } + } /** * Paints the divider. @@ -472,6 +486,7 @@ public class BasicSplitPaneDivider extends Container b.setFocusPainted(false); b.setBorderPainted(false); b.setRequestFocusEnabled(false); + b.setEnabled(splitPane.isEnabled()); return b; } @@ -529,6 +544,7 @@ public class BasicSplitPaneDivider extends Container b.setFocusPainted(false); b.setBorderPainted(false); b.setRequestFocusEnabled(false); + b.setEnabled(splitPane.isEnabled()); return b; } diff --git a/test/jdk/javax/swing/JSplitPane/TestSplitPaneEnableTest.java b/test/jdk/javax/swing/JSplitPane/TestSplitPaneEnableTest.java new file mode 100644 index 00000000000..0172e4b5242 --- /dev/null +++ b/test/jdk/javax/swing/JSplitPane/TestSplitPaneEnableTest.java @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2024, 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 5021949 + * @summary Verifies JSplitPane setEnabled(false) disables one touch expandable clicks + * @run main TestSplitPaneEnableTest + */ + +import java.awt.Point; +import java.awt.event.InputEvent; +import javax.swing.JButton; +import javax.swing.JSplitPane; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; + +public class TestSplitPaneEnableTest { + private static JButton leftOneTouchButton; + private static JButton rightOneTouchButton; + + private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) { + try { + UIManager.setLookAndFeel(laf.getClassName()); + } catch (UnsupportedLookAndFeelException ignored) { + System.out.println("Unsupported LAF: " + laf.getClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + public static void main(String[] args) throws Exception { + for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) { + if (laf.getClassName().toLowerCase().contains("gtk")) { + continue; + } + System.out.println("Testing LAF : " + laf.getClassName()); + + SwingUtilities.invokeAndWait(() -> { + setLookAndFeel(laf); + JSplitPane jsp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, + new JButton("Left"), new JButton("Right")); + jsp.setUI(new TestSplitPaneUI()); + jsp.setOneTouchExpandable(true); + jsp.setEnabled(false); + if (leftOneTouchButton.isEnabled()) { + throw new RuntimeException("leftButton is enabled for disabled JSplitPane"); + } + if (rightOneTouchButton.isEnabled()) { + throw new RuntimeException("rightButton is enabled for disabled JSplitPane"); + } + + }); + } + } + + static class TestSplitPaneUI extends BasicSplitPaneUI { + + public TestSplitPaneUI() { + super(); + } + + public BasicSplitPaneDivider createDefaultDivider() { + return new TestSplitPaneDivider(this); + } + } + + static class TestSplitPaneDivider extends BasicSplitPaneDivider { + + public TestSplitPaneDivider(BasicSplitPaneUI ui) { + super(ui); + } + + protected JButton createLeftOneTouchButton() { + leftOneTouchButton = super.createLeftOneTouchButton(); + return leftOneTouchButton; + } + + protected JButton createRightOneTouchButton() { + rightOneTouchButton = super.createRightOneTouchButton(); + return rightOneTouchButton; + } + } +} +