Changeset 3215 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2010-05-03T10:52:48+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #4979 Exception when opening the download window; fixed #2221 - Unexcepted Exception when typing into "Change values?" box with an input method on Mac OS X

Location:

trunk/src/org/openstreetmap/josm/gui/tagging/ac

Files:

• AutoCompletingComboBox.java (modified) (2 diffs)
• AutoCompletingTextField.java (modified) (2 diffs)
• AutoCompletionListItem.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
+import javax.swing.text.StyleConstants;
 
 /**
@@ -57 +58 @@
                 return;
             if (!autocompleteEnabled)
+                return;
+            // input method for non-latin characters (e.g. scim)
+            if (a != null && a.isDefined(StyleConstants.ComposedTextAttribute))
                 return;
 

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

@@ -19 +19 @@
 import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
+import javax.swing.text.StyleConstants;
 
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -52 +53 @@
             }
 
+            // input method for non-latin characters (e.g. scim)
+            if (a != null && a.isDefined(StyleConstants.ComposedTextAttribute)) {
+                super.insertString(offs, str, a);
+                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

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

@@ -25 +25 @@
      * constructor
      */
+    public AutoCompletionListItem(String value, AutoCompletionItemPritority priority) {
+        this.value = value;
+        this.priority = priority;
+    }
+
+    public AutoCompletionListItem(String value) {
+        this.value = value;
+        priority = AutoCompletionItemPritority.UNKNOWN;
+    }
+
     public AutoCompletionListItem() {
         value = "";
@@ -30 +40 @@
     }
 
-    public AutoCompletionListItem(String value, AutoCompletionItemPritority priority) {
-        this.value = value;
-        this.priority = priority;
-    }
 
     /**