diff options
author | asaha <none@none> | 2014-12-17 12:50:15 -0800 |
---|---|---|
committer | asaha <none@none> | 2014-12-17 12:50:15 -0800 |
commit | 74eb0ce873dd5e131110a148071b394441e7d535 (patch) | |
tree | ee897640dcb54dcb68c45492eb4a796524ef7e20 /src/share/classes/javax | |
parent | d6ed5db35e9d72b056f15f718160104667554c08 (diff) | |
parent | 04679fcce4733e46dcda00bf4aa1738abdf12f18 (diff) |
Merge
Diffstat (limited to 'src/share/classes/javax')
-rw-r--r-- | src/share/classes/javax/swing/JComboBox.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/share/classes/javax/swing/JComboBox.java b/src/share/classes/javax/swing/JComboBox.java index 6e71c43cb..0862f437a 100644 --- a/src/share/classes/javax/swing/JComboBox.java +++ b/src/share/classes/javax/swing/JComboBox.java @@ -1308,8 +1308,8 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible { */ public void actionPerformed(ActionEvent e) { ComboBoxEditor editor = getEditor(); - if ((editor != null) && (e != null) - && (editor.getEditorComponent() == e.getSource())) { + if ((editor != null) && (e != null) && (editor == e.getSource() + || editor.getEditorComponent() == e.getSource())) { setPopupVisible(false); getModel().setSelectedItem(editor.getItem()); String oldCommand = getActionCommand(); |