Changeset 8268 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

Timestamp:

2015-04-25T20:57:20+02:00 (9 years ago)

Author:

simon04

Message:

fix #9533 - Do not autocomplete in combo boxes unless cursor is at the end

File:

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

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

@@ -65 +65 @@
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+            // TODO get rid of code duplication w.r.t. AutoCompletingTextField.AutoCompletionDocument.insertString
+
             if (selecting || (offs == 0 && str.equals(getText(0, getLength()))))
                 return;
@@ -82 +84 @@
             if (a != null && a.isDefined(StyleConstants.ComposedTextAttribute))
                 return;
+
+            // if the current offset isn't at the end of the document we don't autocomplete.
+            // If a highlighted autocompleted suffix was present and we get here Swing has
+            // already removed it from the document. getLength() therefore doesn't include the
+            // autocompleted suffix.
+            if (offs + str.length() < getLength()) {
+                return;
+            }
 
             int size = getLength();