diff options
Diffstat (limited to 'libjava/javax/swing/JLabel.java')
| -rw-r--r-- | libjava/javax/swing/JLabel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/javax/swing/JLabel.java b/libjava/javax/swing/JLabel.java index 19f992c..c6bc1bd 100644 --- a/libjava/javax/swing/JLabel.java +++ b/libjava/javax/swing/JLabel.java @@ -289,7 +289,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants String oldText = labelText; labelText = text; firePropertyChange(TEXT_CHANGED_PROPERTY, oldText, labelText); - if (labelText.length() <= underlinedChar) + if (labelText != null && labelText.length() <= underlinedChar) setDisplayedMnemonicIndex(labelText.length() - 1); } } |