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

8238824: [macos] javax/swing/JSpinner/4840869/bug4840869.java fails on macos

Browse Source 
Reviewed-by: serb, prr
This commit is contained in:
Prasanta Sadhukhan 2020-05-18 11:18:51 +05:30
parent 4cf3e6bfd8
commit f76b6e7450
2 changed files with 262 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java
View File

@ -140,6 +140,14 @@ public class AquaSpinnerUI extends SpinnerUI {
protected void installListeners() {
spinner.addPropertyChangeListener(getPropertyChangeListener());
JComponent editor = spinner.getEditor();
if (editor != null && editor instanceof JSpinner.DefaultEditor) {
JTextField tf = ((JSpinner.DefaultEditor)editor).getTextField();
if (tf != null) {
tf.addFocusListener(getNextButtonHandler());
tf.addFocusListener(getPreviousButtonHandler());
}
}
}
protected void uninstallListeners() {
@ -326,14 +334,16 @@ public class AquaSpinnerUI extends SpinnerUI {
}
@SuppressWarnings("serial") // Superclass is not serializable across versions
private static class ArrowButtonHandler extends AbstractAction implements MouseListener {
private static class ArrowButtonHandler extends AbstractAction implements FocusListener, MouseListener {
final javax.swing.Timer autoRepeatTimer;
final boolean isNext;
JSpinner spinner = null;
JButton arrowButton = null;
ArrowButtonHandler(final String name, final boolean isNext) {
super(name);
this.isNext = isNext;
autoRepeatTimer = new javax.swing.Timer(60, this);
autoRepeatTimer.setInitialDelay(300);
@ -352,27 +362,36 @@ public class AquaSpinnerUI extends SpinnerUI {
if (!(e.getSource() instanceof javax.swing.Timer)) {
// Most likely resulting from being in ActionMap.
spinner = eventToSpinner(e);
if (e.getSource() instanceof JButton) {
arrowButton = (JButton)e.getSource();
}
} else {
if (arrowButton != null && !arrowButton.getModel().isPressed()
&& autoRepeatTimer.isRunning()) {
autoRepeatTimer.stop();
spinner = null;
arrowButton = null;
}
}
if (spinner == null) {
return;
}
if (spinner != null) {
try {
final int calendarField = getCalendarField(spinner);
spinner.commitEdit();
if (calendarField != -1) {
((SpinnerDateModel) spinner.getModel()).setCalendarField(calendarField);
try {
final int calendarField = getCalendarField(spinner);
spinner.commitEdit();
if (calendarField != -1) {
((SpinnerDateModel) spinner.getModel()).setCalendarField(calendarField);
}
final Object value = (isNext) ? spinner.getNextValue() : spinner.getPreviousValue();
if (value != null) {
spinner.setValue(value);
select(spinner);
}
} catch (final IllegalArgumentException iae) {
UIManager.getLookAndFeel().provideErrorFeedback(spinner);
} catch (final ParseException pe) {
UIManager.getLookAndFeel().provideErrorFeedback(spinner);
}
final Object value = (isNext) ? spinner.getNextValue() : spinner.getPreviousValue();
if (value != null) {
spinner.setValue(value);
select(spinner);
}
} catch (final IllegalArgumentException iae) {
UIManager.getLookAndFeel().provideErrorFeedback(spinner);
} catch (final ParseException pe) {
UIManager.getLookAndFeel().provideErrorFeedback(spinner);
}
}
@ -381,6 +400,9 @@ public class AquaSpinnerUI extends SpinnerUI {
* associated with the value that is being incremented.
*/
private void select(final JSpinner spinnerComponent) {
if (spinnerComponent == null) {
return;
}
final JComponent editor = spinnerComponent.getEditor();
if (!(editor instanceof JSpinner.DateEditor)) {
return;
@ -487,6 +509,7 @@ public class AquaSpinnerUI extends SpinnerUI {
@Override
public void mouseReleased(final MouseEvent e) {
autoRepeatTimer.stop();
arrowButton = null;
spinner = null;
}
@ -533,6 +556,23 @@ public class AquaSpinnerUI extends SpinnerUI {
child.requestFocus();
}
}
public void focusGained(FocusEvent e) {
}
public void focusLost(FocusEvent e) {
if (spinner == eventToSpinner(e)) {
if (autoRepeatTimer.isRunning()) {
autoRepeatTimer.stop();
}
spinner = null;
if (arrowButton != null) {
ButtonModel model = arrowButton.getModel();
model.setPressed(false);
arrowButton = null;
}
}
}
}
@SuppressWarnings("serial") // Superclass is not serializable across versions
@ -726,6 +766,24 @@ public class AquaSpinnerUI extends SpinnerUI {
final JComponent newEditor = (JComponent) e.getNewValue();
ui.replaceEditor(oldEditor, newEditor);
ui.updateEnabledState();
if (oldEditor instanceof JSpinner.DefaultEditor) {
JTextField tf = ((JSpinner.DefaultEditor)oldEditor).getTextField();
if (tf != null) {
tf.removeFocusListener(getNextButtonHandler());
tf.removeFocusListener(getPreviousButtonHandler());
}
}
if (newEditor instanceof JSpinner.DefaultEditor) {
JTextField tf = ((JSpinner.DefaultEditor)newEditor).getTextField();
if (tf != null) {
if (tf.getFont() instanceof UIResource) {
Font font = spinner.getFont();
tf.setFont(font == null ? null : new FontUIResource(font));
}
tf.addFocusListener(getNextButtonHandler());
tf.addFocusListener(getPreviousButtonHandler());
}
}
} else if ("componentOrientation".equals(propertyName)) {
ComponentOrientation o
= (ComponentOrientation) e.getNewValue();

186
test/jdk/javax/swing/JSpinner/TestJSpinnerFocusLost.java Normal file
View File

@ -0,0 +1,186 @@
/*
* Copyright (c) 2020, 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
* @key headful
* @bug 4840869
* @summary JSpinner keeps spinning while JOptionPane is shown on ChangeListener
* @run main TestJSpinnerFocusLost
*/
import java.awt.Component;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Robot;
import java.awt.event.InputEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import javax.swing.JFrame;
import javax.swing.JSpinner;
import javax.swing.JOptionPane;
import javax.swing.SpinnerNumberModel;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
public class TestJSpinnerFocusLost extends JFrame implements ChangeListener, FocusListener {
JSpinner spinner;
boolean spinnerGainedFocus = false;
boolean spinnerLostFocus = false;
static TestJSpinnerFocusLost b;
Point p;
Rectangle rect;
static Robot robot;
public static void blockTillDisplayed(Component comp) {
Point p = null;
while (p == null) {
try {
p = comp.getLocationOnScreen();
} catch (IllegalStateException e) {
try {
Thread.sleep(1000);
} catch (InterruptedException ie) {
}
}
}
}
public TestJSpinnerFocusLost() {
spinner = new JSpinner(new SpinnerNumberModel(10, 1, 100, 1));
spinner.addChangeListener(this);
((JSpinner.DefaultEditor)spinner.getEditor()).getTextField().addFocusListener(this);
getContentPane().add(spinner);
}
public void doTest() throws Exception {
blockTillDisplayed(spinner);
SwingUtilities.invokeAndWait(() -> {
((JSpinner.DefaultEditor)spinner.getEditor()).getTextField().requestFocus();
});
try {
synchronized (TestJSpinnerFocusLost.this) {
if (!spinnerGainedFocus) {
TestJSpinnerFocusLost.this.wait(2000);
}
}
SwingUtilities.invokeAndWait(() -> {
p = spinner.getLocationOnScreen();
rect = spinner.getBounds();
});
robot.delay(1000);
robot.mouseMove(p.x+rect.width-5, p.y+3);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
synchronized (TestJSpinnerFocusLost.this) {
while (!spinnerLostFocus) {
TestJSpinnerFocusLost.this.wait(2000);
}
}
} catch(Exception ex) {
ex.printStackTrace();
}
if ( ((Integer) spinner.getValue()).intValue() != 11 ) {
System.out.println("spinner value " + ((Integer) spinner.getValue()).intValue());
throw new RuntimeException("Spinner value shouldn't be other than 11");
}
}
private boolean changing = false;
public void stateChanged(ChangeEvent e) {
if (changing) {
return;
}
JSpinner spinner = (JSpinner)e.getSource();
int value = ((Integer) spinner.getValue()).intValue();
if (value > 10) {
changing = true;
JOptionPane.showMessageDialog(spinner, "10 exceeded");
}
}
public void focusGained(FocusEvent e) {
synchronized (TestJSpinnerFocusLost.this) {
spinnerGainedFocus = true;
TestJSpinnerFocusLost.this.notifyAll();
}
}
public void focusLost(FocusEvent e) {
synchronized (TestJSpinnerFocusLost.this) {
spinnerLostFocus = true;
TestJSpinnerFocusLost.this.notifyAll();
}
}
private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
try {
UIManager.setLookAndFeel(laf.getClassName());
} catch (UnsupportedLookAndFeelException ignored) {
System.out.println("Unsupported L&F: " + laf.getClassName());
} catch (ClassNotFoundException | InstantiationException
| IllegalAccessException e) {
throw new RuntimeException(e);
}
}
public static void main(String[] argv) throws Exception {
robot = new Robot();
robot.setAutoWaitForIdle(true);
robot.setAutoDelay(250);
for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
System.out.println("Testing L&F: " + laf.getClassName());
SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
try {
SwingUtilities.invokeAndWait(() -> {
b = new TestJSpinnerFocusLost();
b.pack();
b.setLocationRelativeTo(null);
b.setVisible(true);
});
robot.waitForIdle();
b.doTest();
robot.delay(500);
} finally {
SwingUtilities.invokeAndWait(() -> {
if (b != null) b.dispose();
});
}
robot.delay(1000);
}
}
}