Skip to content

Commit

Permalink
5021949: JSplitPane setEnabled(false) shouldn't be partially functional
Browse files Browse the repository at this point in the history
Reviewed-by: abhiscxk, achung, aivanov
  • Loading branch information
prsadhuk committed Jul 2, 2024
1 parent ee4720a commit 5fe07b3
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JSplitPane.java
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -41,6 +41,7 @@
import javax.accessibility.AccessibleStateSet;
import javax.accessibility.AccessibleValue;
import javax.swing.plaf.SplitPaneUI;
import javax.swing.plaf.basic.BasicSplitPaneUI;

/**
* <code>JSplitPane</code> is used to divide two (and only two)
Expand Down Expand Up @@ -361,6 +362,17 @@ public JSplitPane(int newOrientation,

}

/**
* {@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&amp;F object that renders this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,20 @@ else if (e.getPropertyName() == JSplitPane.
}
}

/**
* {@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.
Expand Down Expand Up @@ -472,6 +486,7 @@ public boolean isFocusTraversable() {
b.setFocusPainted(false);
b.setBorderPainted(false);
b.setRequestFocusEnabled(false);
b.setEnabled(splitPane.isEnabled());
return b;
}

Expand Down Expand Up @@ -529,6 +544,7 @@ public boolean isFocusTraversable() {
b.setFocusPainted(false);
b.setBorderPainted(false);
b.setRequestFocusEnabled(false);
b.setEnabled(splitPane.isEnabled());
return b;
}

Expand Down
109 changes: 109 additions & 0 deletions test/jdk/javax/swing/JSplitPane/TestSplitPaneEnableTest.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
}

1 comment on commit 5fe07b3

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.