Changeset 6017 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-06-24T12:54:26+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8818 - NPE in JosmComboBox

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -15 +15 @@
 
 import javax.accessibility.Accessible;
+import javax.swing.ComboBoxEditor;
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
@@ -218 +219 @@
         private void enableMenu() {
             if (launcher == null) {
-                Component editorComponent = getEditor().getEditorComponent();
-                if (editorComponent instanceof JTextComponent) {
-                    component = (JTextComponent) editorComponent;
-                    component.addMouseListener(this);
-                    launcher = TextContextualPopupMenu.enableMenuFor(component);
+                ComboBoxEditor editor = getEditor();
+                if (editor != null) {
+                    Component editorComponent = editor.getEditorComponent();
+                    if (editorComponent instanceof JTextComponent) {
+                        component = (JTextComponent) editorComponent;
+                        component.addMouseListener(this);
+                        launcher = TextContextualPopupMenu.enableMenuFor(component);
+                    }
                 }
             }