Changeset 2088 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

09.09.2009 19:38:48 (3 years ago)

Author:

Gubaer

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (6 diffs)

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();