Changeset 7863 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

Timestamp:

2014-12-20T22:08:29+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #10470 - fix invalid recognition of items in AutoCompletionComboBox

File:

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

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

@@ -160 +160 @@
             JList<E> list = getList();
             if (list != null) {
-                if (list.getPrototypeCellValue() != prototype) {
+                if (!prototype.equals(list.getPrototypeCellValue())) {
                     list.setPrototypeCellValue(prototype);
                 }
@@ -197 +197 @@
 
         private void enableMenu() {
-            if (launcher == null) {
-                if (editor != null) {
-                    Component editorComponent = editor.getEditorComponent();
-                    if (editorComponent instanceof JTextComponent) {
-                        component = (JTextComponent) editorComponent;
-                        component.addMouseListener(this);
-                        launcher = TextContextualPopupMenu.enableMenuFor(component);
-                    }
+            if (launcher == null && editor != null) {
+                Component editorComponent = editor.getEditorComponent();
+                if (editorComponent instanceof JTextComponent) {
+                    component = (JTextComponent) editorComponent;
+                    component.addMouseListener(this);
+                    launcher = TextContextualPopupMenu.enableMenuFor(component);
                 }
             }
@@ -229 +227 @@
 
         private void processEvent(MouseEvent e) {
-            if (launcher != null && !e.isPopupTrigger()) {
-                if (launcher.getMenu().isShowing()) {
-                    launcher.getMenu().setVisible(false);
-                }
+            if (launcher != null && !e.isPopupTrigger() && launcher.getMenu().isShowing()) {
+                launcher.getMenu().setVisible(false);
             }
         }