Changeset 8267 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java

Timestamp:

2015-04-25T19:33:39+02:00 (9 years ago)

Author:

simon04

Message:

fix #10720 - Auto completion changing default values in presets

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.EventObject;
+import java.util.Objects;
 
 import javax.swing.ComboBoxEditor;
@@ -95 +96 @@
             String prefix = currentText.substring(0, offs);
             autoCompletionList.applyFilter(prefix+str);
-            if (autoCompletionList.getFilteredSize()>0) {
+            if (autoCompletionList.getFilteredSize() > 0 && !Objects.equals(str, noAutoCompletionString)) {
                 // there are matches. Insert the new text and highlight the
                 // auto completed suffix
@@ -120 +121 @@
     /** the auto completion list user input is matched against */
     protected AutoCompletionList autoCompletionList = null;
+    /** a string which should not be auto completed */
+    protected String noAutoCompletionString = null;
 
     @Override
@@ -219 +222 @@
     }
 
+    @Override
+    public void setText(String t) {
+        // disallow auto completion for this explicitly set string
+        this.noAutoCompletionString = t;
+        super.setText(t);
+    }
+
     /**
      * Sets the maximum number of characters allowed.