archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8205144: JSpinner may change the font after became visible

Browse source 
Reviewed-by: psadhukhan
This commit is contained in:
Sergey Bylokhov 2018-06-23 11:48:42 -07:00
parent 9eeb3ed886
commit 1c1a099b3c
4 changed files with 113 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/java.desktop/share/classes/javax/swing/JSpinner.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, 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
@ -29,6 +29,8 @@ import java.awt.*;
import java.awt.event.*;
import javax.swing.event.*;
import javax.swing.plaf.FontUIResource;
import javax.swing.plaf.UIResource;
import javax.swing.text.*;
import javax.swing.plaf.SpinnerUI;
@ -743,20 +745,32 @@ public class JSpinner extends JComponent implements Accessible
Object source = e.getSource();
String name = e.getPropertyName();
if ((source instanceof JFormattedTextField) && "value".equals(name)) {
Object lastValue = spinner.getValue();
if (source instanceof JFormattedTextField) {
if ("value".equals(name)) {
Object lastValue = spinner.getValue();
// Try to set the new value
try {
spinner.setValue(getTextField().getValue());
} catch (IllegalArgumentException iae) {
// SpinnerModel didn't like new value, reset
// Try to set the new value
try {
((JFormattedTextField)source).setValue(lastValue);
} catch (IllegalArgumentException iae2) {
// Still bogus, nothing else we can do, the
// SpinnerModel and JFormattedTextField are now out
// of sync.
spinner.setValue(getTextField().getValue());
} catch (IllegalArgumentException iae) {
// SpinnerModel didn't like new value, reset
try {
((JFormattedTextField)source).setValue(lastValue);
} catch (IllegalArgumentException iae2) {
// Still bogus, nothing else we can do, the
// SpinnerModel and JFormattedTextField are now out
// of sync.
}
}
} else if ("font".equals(name)) {
Object newfont = e.getNewValue();
if (newfont instanceof UIResource) {
// The text field font must match the JSpinner font if
// the text field font was not set by the user
Font font = spinner.getFont();
if (!newfont.equals(font)) {
getTextField().setFont(new FontUIResource(font));
}
}
}
}