Changeset 2655 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

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/gui/dialogs/changeset

Files:

• ChangesetListModel.java (modified) (3 diffs)
• ChangesetsInActiveDataLayerListModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.DefaultListModel;
@@ -20 +19 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Storage;
 
 public class ChangesetListModel extends DefaultListModel  implements ChangesetCacheListener{
-    static private final Logger logger = Logger.getLogger(ChangesetListModel.class.getName());
+    //static private final Logger logger = Logger.getLogger(ChangesetListModel.class.getName());
 
     private final List<Changeset> data = new ArrayList<Changeset>();
+    private final Storage<Changeset> shownChangesets = new Storage<Changeset>();
     private DefaultListSelectionModel selectionModel;
 
@@ -63 +64 @@
     }
 
+    protected void addChangeset(Changeset changeset) {
+        if (shownChangesets.add(changeset)) {
+            setChangesets(shownChangesets);
+            updateModel();
+        }
+    }
+
+    protected void removeChangeset(Changeset changeset) {
+        if (shownChangesets.remove(changeset)) {
+            setChangesets(shownChangesets);
+            updateModel();
+        }
+    }
+
     protected void setChangesets(Collection<Changeset> changesets) {
+        shownChangesets.clear();
+        if (changesets != null) {
+            shownChangesets.addAll(changesets);
+        }
+        updateModel();
+    }
+
+    private void updateModel() {
         Set<Changeset> sel = getSelectedChangesets();
         data.clear();
-        if (changesets == null) {
-            fireContentsChanged(this, 0, getSize());
-            return;
-        }
-        data.addAll(changesets);
+        data.addAll(shownChangesets);
         ChangesetCache cache = ChangesetCache.getInstance();
         for (Changeset cs: data) {

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java

@@ -4 +4 @@
 import javax.swing.DefaultListSelectionModel;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.layer.DataChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+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;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 
-public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements MapView.LayerChangeListener, DataChangeListener{
+public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel implements DataSetListener  {
 
     public ChangesetsInActiveDataLayerListModel(DefaultListSelectionModel selectionModel) {
@@ -16 +23 @@
     }
 
-    /* ---------------------------------------------------------------------------- */
-    /* Interface LayerChangeListener                                                */
-    /* ---------------------------------------------------------------------------- */
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        if (oldLayer != null && oldLayer instanceof OsmDataLayer) {
-            OsmDataLayer l = (OsmDataLayer)oldLayer;
-            l.listenerDataChanged.remove(this);
-        }
-        if (newLayer == null) {
-            setChangesets(null);
-        } else if (newLayer instanceof OsmDataLayer){
-            OsmDataLayer l = (OsmDataLayer)newLayer;
-            l.listenerDataChanged.add(this);
-            initFromDataSet(l.data);
-        } else {
-            setChangesets(null);
+    public void dataChanged(DataChangedEvent event) {
+        initFromPrimitives(event.getPrimitives());
+    }
+
+    public void nodeMoved(NodeMovedEvent event) {/* ignored */}
+
+    public void primtivesAdded(PrimitivesAddedEvent event) {
+        for (OsmPrimitive primitive:event.getPrimitives()) {
+            addChangeset(new Changeset(primitive.getChangesetId()));
         }
     }
-    public void layerAdded(Layer newLayer) {}
-    public void layerRemoved(Layer oldLayer) {}
 
-    /* ---------------------------------------------------------------------------- */
-    /* Interface DataChangeListener                                                 */
-    /* ---------------------------------------------------------------------------- */
-    public void dataChanged(OsmDataLayer l) {
-        if (l == null) return;
-        if (l != Main.main.getEditLayer()) return;
-        initFromDataSet(l.data);
+    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+        for (OsmPrimitive primitive:event.getPrimitives()) {
+            removeChangeset(new Changeset(primitive.getChangesetId()));
+        }
     }
+
+    public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
+
+    public void tagsChanged(TagsChangedEvent event) {/* ignored */}
+
+    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        if (event instanceof ChangesetIdChangedEvent) {
+            ChangesetIdChangedEvent e = (ChangesetIdChangedEvent) event;
+            removeChangeset(new Changeset(e.getOldChangesetId()));
+            addChangeset(new Changeset(e.getNewChangesetId()));
+        }
+    }
+
+    public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
+
 }