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

Timestamp:

2017-12-03T18:09:08+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15627 - autocompletion values not correctly reset on change of focus (regression from r13139)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -43 +43 @@
 import javax.swing.Box;
 import javax.swing.ButtonGroup;
+import javax.swing.ComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
@@ -637 +638 @@
                    Logging.trace("Focus gained by {0}, e={1}", values, e);
                    String key = keys.getEditor().getItem().toString();
+                   List<AutoCompletionItem> correctItems = autocomplete.getTagValues(getAutocompletionKeys(key), comparator);
+                   ComboBoxModel<AutoCompletionItem> currentModel = values.getModel();
+                   final int size = correctItems.size();
+                   boolean valuesOK = size == currentModel.getSize();
+                   for (int i = 0; valuesOK && i < size; i++) {
+                       valuesOK = Objects.equals(currentModel.getElementAt(i), correctItems.get(i));
+                   }
+                   if (!valuesOK) {
+                       values.setPossibleAcItems(correctItems);
+                   }
                    if (!Objects.equals(key, objKey)) {
-                       values.setPossibleAcItems(autocomplete.getTagValues(getAutocompletionKeys(key), comparator));
                        values.getEditor().selectAll();
                        objKey = key;