stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8344914: OOME in several tests since JDK-6672644 - JComboBox still scrolling

Browse Source 
Reviewed-by: prr
This commit is contained in:
Damon Nguyen 2024-11-24 08:54:17 +00:00
parent a6220fa903
commit 6711e1327a
2 changed files with 0 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
View File

@ -31,7 +31,6 @@ import java.awt.Container;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.KeyboardFocusManager;
import java.awt.LayoutManager;
import java.awt.Point;
import java.awt.Rectangle;
@ -123,8 +122,6 @@ public class BasicScrollBarUI
protected ArrowButtonListener buttonListener;
/** Model listener */
protected ModelListener modelListener;
/** KeyboardFocusListener */
protected KeyboardFocusListener keyboardFocusListener;
/** Thumb rectangle */
protected Rectangle thumbRect;
@ -359,15 +356,12 @@ public class BasicScrollBarUI
buttonListener = createArrowButtonListener();
modelListener = createModelListener();
propertyChangeListener = createPropertyChangeListener();
keyboardFocusListener = createKeyboardFocusListener();
scrollbar.addMouseListener(trackListener);
scrollbar.addMouseMotionListener(trackListener);
scrollbar.getModel().addChangeListener(modelListener);
scrollbar.addPropertyChangeListener(propertyChangeListener);
scrollbar.addFocusListener(getHandler());
KeyboardFocusManager.getCurrentKeyboardFocusManager()
.addPropertyChangeListener(keyboardFocusListener);
if (incrButton != null) {
incrButton.addMouseListener(buttonListener);
@ -449,8 +443,6 @@ public class BasicScrollBarUI
incrButton.removeMouseListener(buttonListener);
}
KeyboardFocusManager.getCurrentKeyboardFocusManager()
.removePropertyChangeListener(keyboardFocusListener);
scrollbar.getModel().removeChangeListener(modelListener);
scrollbar.removeMouseListener(trackListener);
scrollbar.removeMouseMotionListener(trackListener);
@ -517,14 +509,6 @@ public class BasicScrollBarUI
return getHandler();
}
/**
* Creates a keyboard focus listener.
* @return a keyboard focus listener
*/
protected KeyboardFocusListener createKeyboardFocusListener() {
return new KeyboardFocusListener();
}
private void updateThumbState(int x, int y) {
Rectangle rect = getThumbBounds();
@ -1218,35 +1202,6 @@ public class BasicScrollBarUI
return supportsAbsolutePositioning;
}
/**
* A listener to listen for keyboard focus changes.
*/
protected class KeyboardFocusListener implements PropertyChangeListener {
/**
* Constructs a {@code KeyboardFocusListener}.
*/
protected KeyboardFocusListener() {}
@Override
public void propertyChange(PropertyChangeEvent e) {
String propertyName = e.getPropertyName();
if ("focusOwner" == propertyName) {
// Stop scrolling if no longer focus owner
if (e.getNewValue() == null && scrollTimer.isRunning()) {
scrollTimer.stop();
buttonListener.handledEvent = false;
scrollbar.setValueIsAdjusting(false);
if (incrButton.getModel().isPressed()) {
incrButton.getModel().setPressed(false);
} else if (decrButton.getModel().isPressed()) {
decrButton.getModel().setPressed(false);
}
}
}
}
}
/**
* A listener to listen for model changes.
*/

75
test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java
View File

@ -1,75 +0,0 @@
/*
* 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.JComboBox;
import javax.swing.JFrame;
/*
* @test
* @bug 6672644
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @summary Tests JComboBox scrollbar behavior when alt-tabbing
* @requires os.family != "mac"
* @run main/manual JComboBoxScrollFocusTest
*/
public class JComboBoxScrollFocusTest {
private static final String INSTRUCTIONS =
"""
Click on the dropdown button for the JComboBox in the test frame.
Then, press and hold the left click button on the down arrow button
in the popup list. While holding the left click button, the list
should be scrolling down. Press ALT + TAB while holding down the
left click to switch focus to a different window. Then release the
left click button. Focus the test frame again and click the
dropdown button for the JComboBox again. The list should be
stationary and not be automatically scrolling.
If you are able to execute all steps successfully then the test
passes, otherwise it fails.
""";
public static void main(String[] args) throws Exception {
PassFailJFrame
.builder()
.title("JComboBoxScrollFocusTest Test Instructions")
.instructions(INSTRUCTIONS)
.columns(40)
.testUI(JComboBoxScrollFocusTest::createAndShowGUI)
.build()
.awaitAndCheck();
}
private static JFrame createAndShowGUI() {
JFrame frame = new JFrame("JComboBoxScrollFocusTest Test Frame");
JComboBox<String> combobox = new JComboBox<>();
for (int i = 0; i < 100; i++) {
combobox.addItem(String.valueOf(i));
}
frame.add(combobox);
frame.setSize(400, 200);
frame.setLocationRelativeTo(null);
return frame;
}
}