Changeset 3215 in josm

Timestamp:

03.05.2010 10:52:48 (22 months 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

Files:

• tagging/ac/AutoCompletingComboBox.java (modified) (2 diffs)
• tagging/ac/AutoCompletingTextField.java (modified) (2 diffs)
• tagging/ac/AutoCompletionListItem.java (modified) (2 diffs)
• widgets/ComboBoxHistory.java (modified) (6 diffs)
• widgets/HistoryComboBox.java (modified) (1 diff)

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;
-    }
 
     /**

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

@@ -35 +35 @@
 import javax.swing.DefaultComboBoxModel;
 
-public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<String> {
+import org.openstreetmap.josm.gui.tagging.ac.*;
+
+public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<AutoCompletionListItem> {
 
     private int maxSize = 10;
@@ -50 +52 @@
     @Override
     public void addElement(Object o) {
-        String newEntry = (String)o;
+        if (o instanceof String) {
+            o = new AutoCompletionListItem((String) o);
+        }
+
+        String newEntry = ((AutoCompletionListItem)o).getValue();
 
         // if history contains this object already, delete it,
         // so that it looks like a move to the top
         for (int i = 0; i < getSize(); i++) {
-            String oldEntry = (String) getElementAt(i);
+            String oldEntry = ((AutoCompletionListItem) getElementAt(i)).getValue();
             if(oldEntry.equals(newEntry)) {
                 removeElementAt(i);
@@ -75 +81 @@
     }
 
-    public Iterator<String> iterator() {
-        return new Iterator<String>() {
+    public Iterator<AutoCompletionListItem> iterator() {
+        return new Iterator<AutoCompletionListItem>() {
 
             private int position = -1;
@@ -90 +96 @@
             }
 
-            public String next() {
+            public AutoCompletionListItem next() {
                 position++;
-                return getElementAt(position).toString();
+                return (AutoCompletionListItem)getElementAt(position);
             }
 
@@ -98 +104 @@
     }
 
-    public void setItems(List<String> items) {
+    public void setItemsAsString(List<String> items) {
         removeAllElements();
-        Collections.reverse(items);
-        for (String item : items) {
-            addElement(item);
+        for (int i = items.size()-1; i>=0; i--) {
+            addElement(new AutoCompletionListItem(items.get(i)));
         }
-        Collections.reverse(items);
     }
 
-    public List<String> asList() {
+    public List<String> asStringList() {
         List<String> list = new ArrayList<String>(maxSize);
-        for (String item : this) {
-            list.add(item);
+        for (AutoCompletionListItem item : this) {
+            list.add(item.getValue());
         }
         return list;
@@ -125 +129 @@
     private void fireHistoryChanged() {
         for (HistoryChangedListener l : listeners) {
-            l.historyChanged(asList());
+            l.historyChanged(asStringList());
         }
     }

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

@@ -32 +32 @@
 
     public void setHistory(List<String> history) {
-        model.setItems(history);
+        model.setItemsAsString(history);
     }
 
     public List<String> getHistory() {
-        return model.asList();
+        return model.asStringList();
     }
 }