Changeset 2088 in josm

Timestamp:

09.09.2009 19:38:48 (2 years ago)

Author:

Gubaer

Message:

see #3393: loooong delay when using presets with a large osm file

Location:

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

Files:

• AutoCompletingTextField.java (modified) (3 diffs)
• TaggingPreset.java (modified) (6 diffs)
• ac/AutoCompletionCache.java (modified) (5 diffs)
• ac/AutoCompletionList.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
 import java.util.EventObject;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.logging.Logger;
 
@@ -17 +14 @@
 import javax.swing.JTextField;
 import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
 import javax.swing.text.AttributeSet;
@@ -194 +190 @@
             setText(anObject.toString());
         }
-
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -68 +68 @@
     public String locale_name;
 
-    private static AutoCompletionList autoCompletionList;
-
-    public static AutoCompletionList getPresetAutocompletionList() {
-        if (autoCompletionList == null) {
-            autoCompletionList = new AutoCompletionList();
-        }
-        return autoCompletionList;
-    }
-
     public static abstract class Item {
         protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
             OsmDataLayer layer = Main.main.getEditLayer();
             if (layer == null) return;
-            field.setAutoCompletionList(getPresetAutocompletionList());
+            AutoCompletionList list  = new AutoCompletionList();
+            List<String> values = AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).getValues(key);
+            list.add(values,AutoCompletionItemPritority.IS_IN_DATASET);
+            field.setAutoCompletionList(list);
         }
 
@@ -154 +148 @@
             // find out if our key is already used in the selection.
             Usage usage = determineTextUsage(sel, key);
+            AutoCompletingTextField textField = new AutoCompletingTextField();
+            initAutoCompletionField(textField, key);
             if (usage.unused()){
-                AutoCompletingTextField textField = new AutoCompletingTextField();
-                initAutoCompletionField(textField, key);
                 if (use_last_as_default && lastValue.containsKey(key)) {
                     textField.setText(lastValue.get(key));
@@ -166 +160 @@
             } else if (usage.hasUniqueValue()) {
                 // all objects use the same value
-                AutoCompletingTextField textField = new AutoCompletingTextField();
-                initAutoCompletionField(textField, key);
                 textField.setText(usage.getFirst());
                 value = textField;
@@ -173 +165 @@
             } else {
                 // the objects have different values
-                AutoCompletingTextField textField = new AutoCompletingTextField();
-                initAutoCompletionField(textField, key);
                 JComboBox comboBox = new JComboBox(usage.values.toArray());
                 comboBox.setEditable(true);
@@ -646 +636 @@
     }
 
-    protected void refreshAutocompletionList(final OsmDataLayer layer) {
-        Runnable task = new Runnable() {
-            public void run() {
-                System.out.print("refreshing preset auto completion list ...");
-                AutoCompletionCache.getCacheForLayer(layer).initFromDataSet();
-                AutoCompletionCache.getCacheForLayer(layer).populateWithValues( getPresetAutocompletionList(), false /* don't append */);
-                System.out.println("DONE");
-            }
-        };
-        new Thread(task).run();
-
-    }
     public PresetPanel createPanel(Collection<OsmPrimitive> selected) {
         if (data == null)
@@ -663 +641 @@
         OsmDataLayer layer = Main.main.getEditLayer();
         if (layer != null) {
-            refreshAutocompletionList(layer);
+            AutoCompletionCache.getCacheForLayer(layer).initFromDataSet();
         }
         PresetPanel p = new PresetPanel();

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

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -74 +72 @@
     /** the cached list of member roles */
     private  Set<String> roleCache;
-    /** the cache of all tag values */
-    private  Set<String> allTagValues;
     /**  the layer this cache is built for */
     private OsmDataLayer layer;
@@ -86 +82 @@
         tagCache = new HashMap<String, Set<String>>();
         roleCache = new HashSet<String>();
-        allTagValues = new HashSet<String>();
         this.layer = layer;
     }
@@ -114 +109 @@
         cacheKey(key);
         tagCache.get(key).add(value);
-        allTagValues.add(value);
     }
 
@@ -236 +230 @@
         list.add(tagCache.keySet(), AutoCompletionItemPritority.IS_IN_DATASET);
     }
-
-
-    /**
-     * Populates the an {@see AutoCompletionList} with the currently cached
-     * tag values
-     *
-     * @param list the list to populate
-     * @param append true to add the keys to the list; false, to replace the keys
-     * in the list by the keys in the cache
-     */
-    public void populateWithValues(AutoCompletionList list, boolean append) {
-        if (!append) {
-            list.clear();
-        }
-        list.add(this.allTagValues, AutoCompletionItemPritority.IS_IN_DATASET);
-    }
 }

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

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JTable;
@@ -33 +35 @@
     /** the filter expression */
     private String filter = null;
+    /** map from value to priority */
+    private Map<String,AutoCompletionListItem> valutToItemMap;
 
     /**
@@ -40 +44 @@
         list = new ArrayList<AutoCompletionListItem>();
         filtered = new ArrayList<AutoCompletionListItem>();
+        valutToItemMap = new HashMap<String, AutoCompletionListItem>();
     }
 
@@ -148 +153 @@
 
     protected void appendOrUpdatePriority(AutoCompletionListItem toadd) {
-        AutoCompletionListItem item = lookup(toadd.getValue());
+        AutoCompletionListItem item = valutToItemMap.get(toadd.getValue());
         if (item == null) {
             // new item does not exist yet. Add it to the list
             //
             list.add(toadd);
+            valutToItemMap.put(toadd.getValue(), toadd);
         } else {
             // new item already exists. Update priority if necessary
@@ -191 +197 @@
         return false;
     }
-
-    /**
-     * 
-     * @param value a specific value
-     * @return  the auto completion item for this value; null, if there is no
-     *   such auto completion item
-     */
-    public AutoCompletionListItem lookup(String value) {
-        if (value == null)
-            return null;
-        for (AutoCompletionListItem item : list) {
-            if (item.getValue().equals(value))
-                return item;
-        }
-        return null;
-    }
-
 
     /**