Changeset 2657 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-12-19T12:55:50+01:00 (15 years ago)

Author:

jttt

Message:

Cache list of used tags in properties dialog (faster adding of keys in large datasets)

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• OsmPrimitive.java (modified) (9 diffs)
• event/TagsChangedEvent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -849 +849 @@
     }
 
-    void fireTagsChanged(OsmPrimitive prim) {
-        fireEvent(new TagsChangedEvent(this, prim));
+    void fireTagsChanged(OsmPrimitive prim, Map<String, String> originalKeys) {
+        fireEvent(new TagsChangedEvent(this, prim, originalKeys));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -717 +717 @@
      */
     public void setKeys(Map<String, String> keys) {
+        Map<String, String> originalKeys = getKeys();
         if (keys == null) {
             this.keys = null;
+            keysChangedImpl(originalKeys);
             return;
         }
@@ -728 +730 @@
         }
         this.keys = newKeys;
-        keysChangedImpl();
+        keysChangedImpl(originalKeys);
     }
 
@@ -741 +743 @@
      */
     public final void put(String key, String value) {
+        Map<String, String> originalKeys = getKeys();
         if (key == null)
             return;
@@ -747 +750 @@
         } else if (keys == null || keys.length == 0){
             keys = new String[] {key, value};
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
         } else {
             for (int i=0; i<keys.length;i+=2) {
                 if (keys[i].equals(key)) {
                     keys[i+1] = value;
-                    keysChangedImpl();
+                    keysChangedImpl(originalKeys);
                     return;
                 }
@@ -764 +767 @@
             newKeys[keys.length + 1] = value;
             keys = newKeys;
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
         }
     }
@@ -776 +779 @@
         if (!hasKey(key))
             return;
+        Map<String, String> originalKeys = getKeys();
         if (keys.length == 2) {
             keys = null;
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
             return;
         }
@@ -790 +794 @@
         }
         keys = newKeys;
-        keysChangedImpl();
+        keysChangedImpl(originalKeys);
     }
 
@@ -799 +803 @@
      */
     public final void removeAll() {
-        keys = null;
-        keysChangedImpl();
+        if (keys != null) {
+            Map<String, String> originalKeys = getKeys();
+            keys = null;
+            keysChangedImpl(originalKeys);
+        }
     }
 
@@ -854 +861 @@
     }
 
-    private void keysChangedImpl() {
+    private void keysChangedImpl(Map<String, String> originalKeys) {
         clearCached();
         updateHasDirectionKeys();
         updateTagged();
         if (dataSet != null) {
-            dataSet.fireTagsChanged(this);
+            dataSet.fireTagsChanged(this, originalKeys);
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java

@@ -4 +4 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -11 +12 @@
 
     private final OsmPrimitive primitive;
+    private final Map<String, String> originalKeys;
 
-    public TagsChangedEvent(DataSet dataSet, OsmPrimitive primitive) {
+    public TagsChangedEvent(DataSet dataSet, OsmPrimitive primitive, Map<String, String> originalKeys) {
         super(dataSet);
         this.primitive = primitive;
+        this.originalKeys = originalKeys;
     }
 
@@ -36 +39 @@
     }
 
+    public Map<String, String> getOriginalKeys() {
+        return originalKeys;
+    }
+
 }