Skip to content

Commit

Permalink
8322754: click JComboBox when dialog about to close causes IllegalCom…
Browse files Browse the repository at this point in the history
…ponentStateException

Reviewed-by: abhiscxk, serb
  • Loading branch information
prsadhuk committed Jan 8, 2024
1 parent 3560e68 commit e442769
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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 @@ -921,7 +921,7 @@ public void mousePressed(MouseEvent e) {
if (e.getSource() == list) {
return;
}
if (!SwingUtilities.isLeftMouseButton(e) || !comboBox.isEnabled())
if (!SwingUtilities.isLeftMouseButton(e) || !comboBox.isEnabled() || !comboBox.isShowing())
return;

if ( comboBox.isEditable() ) {
Expand Down
92 changes: 92 additions & 0 deletions test/jdk/javax/swing/JComboBox/ComboPopupBug.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
* 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.
*/

import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;

/*
* @test
* @bug 8322754
* @summary Verifies clicking JComboBox during frame closure causes Exception
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual ComboPopupBug
*/

public class ComboPopupBug {
private static final String instructionsText = """
This test is used to verify that clicking on JComboBox
when frame containing it is about to close should not
cause IllegalStateException.
A JComboBox is shown with Close button at the bottom.
Click on Close and then click on JComboBox arrow button
to try to show combobox popup.
If IllegalStateException is thrown, test will automatically Fail
otherwise click Pass. """;

public static void main(String[] args) throws Exception {
PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
.title("ComboPopup Instructions")
.instructions(instructionsText)
.testTimeOut(5)
.rows(10)
.columns(35)
.build();

SwingUtilities.invokeAndWait(() -> {
JFrame frame = new JFrame("ComboPopup");

JComboBox cb = new JComboBox();
cb.setEditable(true);
cb.addItem("test");
cb.addItem("test2");
cb.addItem("test3");
frame.getContentPane().add(cb, "North");

JButton b = new JButton("Close");
b.addActionListener(
(e)->{
try {
Thread.sleep(3000);
}
catch (Exception ex) {
}
frame.setVisible(false);

});
frame.getContentPane().add(b, "South");
frame.setSize(200, 200);

PassFailJFrame.addTestWindow(frame);
PassFailJFrame.positionTestWindow(frame,
PassFailJFrame.Position.HORIZONTAL);

frame.setVisible(true);
});

passFailJFrame.awaitAndCheck();
}
}

5 comments on commit e442769

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e442769 Oct 24, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e442769 Oct 24, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-e4427698-master in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e4427698 from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 8 Jan 2024 and was reviewed by Abhishek Kumar and Sergey Bylokhov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e4427698-master:backport-GoeLin-e4427698-master
$ git checkout backport-GoeLin-e4427698-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e4427698-master

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e442769 Oct 24, 2024

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e442769 Oct 24, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-e4427698-master in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e4427698 from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 8 Jan 2024 and was reviewed by Abhishek Kumar and Sergey Bylokhov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-e4427698-master:backport-GoeLin-e4427698-master
$ git checkout backport-GoeLin-e4427698-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-GoeLin-e4427698-master

Please sign in to comment.