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

Timestamp:

2009-12-19T10:47:49+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4161 Major slowdown in recent versions, used correct pattern for listeners realized using CopyOnWriteArrayList

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• conflict/ConflictCollection.java (modified) (1 diff)
• osm/ChangesetCache.java (modified) (3 diffs)
• osm/DataSet.java (modified) (2 diffs)
• osm/OsmPrimitive.java (modified) (4 diffs)
• osm/event/AbstractDatasetChangedEvent.java (modified) (1 diff)
• osm/event/ChangesetIdChangedEvent.java (added)
• osm/event/DataSetListener.java (modified) (1 diff)
• osm/event/DataSetListenerAdapter.java (modified) (1 diff)
• osm/history/HistoryDataSet.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -26 +26 @@
 import java.util.Map.Entry;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -44 +43 @@
  */
 public class Preferences {
-    static private final Logger logger = Logger.getLogger(Preferences.class.getName());
+    //static private final Logger logger = Logger.getLogger(Preferences.class.getName());
 
     /**
@@ -131 +130 @@
 
     public void addPreferenceChangeListener(PreferenceChangedListener listener) {
-        if (listener != null && ! listeners.contains(listener)) {
-            listeners.add(listener);
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
         }
     }
 
     public void removePreferenceChangeListener(PreferenceChangedListener listener) {
-        if (listener != null && listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
+        listeners.remove(listener);
     }
 

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -42 +42 @@
 
     public void addConflictListener(IConflictListener listener) {
-        if (listener != null && ! listeners.contains(listener)) {
-            listeners.add(listener);
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
         }
     }
 
     public void removeConflictListener(IConflictListener listener) {
-        if (listener != null) {
-            listeners.remove(listener);
-        }
+        listeners.remove(listener);
     }
 

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

@@ -8 +8 @@
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
 
 import org.openstreetmap.josm.Main;
@@ -15 +14 @@
 
 public class ChangesetCache implements PreferenceChangedListener{
-    static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
+    //static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
     static private final ChangesetCache instance = new ChangesetCache();
 
@@ -32 +31 @@
 
     public void addChangesetCacheListener(ChangesetCacheListener listener) {
-        synchronized(listeners) {
-            if (listener != null && ! listeners.contains(listener)) {
-                listeners.add(listener);
-            }
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
         }
     }
 
     public void removeChangesetCacheListener(ChangesetCacheListener listener) {
-        synchronized(listeners) {
-            if (listener != null && listeners.contains(listener)) {
-                listeners.remove(listener);
-            }
-        }
+        listeners.remove(listener);
     }
 

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.ChangesetIdChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
@@ -863 +864 @@
     }
 
+    void fireChangesetIdChanged(OsmPrimitive primitive, int oldChangesetId, int newChangesetId) {
+        fireEvent(new ChangesetIdChangedEvent(this, Collections.singletonList(primitive), oldChangesetId, newChangesetId));
+    }
+
     public void clenupDeletedPrimitives() {
         if (cleanupDeleted(nodes.iterator())

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

@@ -649 +649 @@
      */
     public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException {
+        if (this.changesetId == changesetId)
+            return;
         if (changesetId < 0)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' >= 0 expected, got {1}", "changesetId", changesetId));
         if (isNew() && changesetId > 0)
             throw new IllegalStateException(tr("Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
+        int old = this.changesetId;
         this.changesetId = changesetId;
+        if (dataSet != null) {
+            dataSet.fireChangesetIdChanged(this, old, changesetId);
+        }
     }
 
@@ -1003 +1009 @@
         flags = other.flags;
         user= other.user;
-        changesetId = other.changesetId;
+        setChangesetId(other.changesetId);
         clearCached();
     }
@@ -1031 +1037 @@
         flags = other.flags;
         user= other.user;
-        changesetId = other.changesetId;
+        setChangesetId(other.changesetId);
     }
 
@@ -1178 +1184 @@
         timestamp = data.getTimestamp();
         user = data.getUser();
-        changesetId = data.getChangesetId();
+        setChangesetId(data.getChangesetId());
         setDeleted(data.isDeleted());
         setModified(data.isModified());

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

@@ -11 +11 @@
 
     public enum DatasetEventType {DATA_CHANGED, NODE_MOVED, PRIMITIVES_ADDED, PRIMITIVES_REMOVED,
-        RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED}
+        RELATION_MEMBERS_CHANGED, TAGS_CHANGED, WAY_NODES_CHANGED, CHANGESET_ID_CHANGED}
 
     protected final DataSet dataSet;

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

@@ -73 +73 @@
 
     /**
+     * Minor dataset change, currently only changeset id changed is supported, but can
+     * be extended in future.
+     * @param event
+     */
+    void otherDatasetChange(AbstractDatasetChangedEvent event);
+
+    /**
      * Called after big changes in dataset. Usually other events are stopped using Dataset.beginUpdate() and
      * after operation is completed (Dataset.endUpdate()), {@link #dataChanged()} is called.
      */
     void dataChanged(DataChangedEvent event);
-
 }

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

@@ -48 +48 @@
     }
 
+    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        listener.processDatasetEvent(event);
+    }
+
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -7 +7 @@
 import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Logger;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -19 +18 @@
  */
 public class HistoryDataSet {
-    private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName());
+    //private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName());
 
     /** the unique instance */
@@ -46 +45 @@
 
     public void addHistoryDataSetListener(HistoryDataSetListener listener) {
-        synchronized(listeners) {
-            if (!listeners.contains(listener)) {
-                listeners.add(listener);
-            }
+        if (listener != null) {
+            listeners.addIfAbsent(listener);
         }
     }
 
     public void removeHistoryDataSetListener(HistoryDataSetListener listener) {
-        synchronized(listeners) {
-            if (listeners.contains(listener)) {
-                listeners.remove(listener);
-            }
-        }
+        listeners.remove(listener);
     }