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

Timestamp:

2009-11-11T21:34:54+01:00 (15 years ago)

Author:

jttt

Message:

Added DatasetListener, Dataset now fire events everytime one of its primitives is changed. Used new Dataset listener in RelationListDialog

Location:

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

Files:

• DataSet.java (modified) (4 diffs)
• DataSetListener.java (added)
• OsmPrimitive.java (modified) (2 diffs)
• Relation.java (modified) (8 diffs)

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

@@ -47 +47 @@
     private Storage<OsmPrimitive> allPrimitives = new Storage<OsmPrimitive>(new IdHash());
     private Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new IdHash());
+    private List<DataSetListener> listeners = new ArrayList<DataSetListener>();
 
     /**
@@ -191 +192 @@
         allPrimitives.add(primitive);
         primitive.setDataset(this);
+        firePrimitivesAdded(Collections.singletonList(primitive));
     }
 
@@ -232 +234 @@
         allPrimitives.remove(primitive);
         primitive.setDataset(null);
+        firePrimitivesRemoved(Collections.singletonList(primitive));
     }
 
@@ -784 +787 @@
     }
 
+
+    public void addDataSetListener(DataSetListener dsl) {
+        listeners.add(dsl);
+    }
+
+    public void removeDataSetListener(DataSetListener dsl) {
+        listeners.remove(dsl);
+    }
+
+    void firePrimitivesAdded(Collection<? extends OsmPrimitive> added) {
+        for (DataSetListener dsl : listeners) {
+            dsl.primtivesAdded(added);
+        }
+    }
+
+    void firePrimitivesRemoved(Collection<? extends OsmPrimitive> removed) {
+        for (DataSetListener dsl : listeners) {
+            dsl.primtivesRemoved(removed);
+        }
+    }
+
+    void fireTagsChanged(OsmPrimitive prim) {
+        for (DataSetListener dsl : listeners) {
+            dsl.tagsChanged(prim);
+        }
+    }
+
+    void fireRelationMembersChanged(Relation r) {
+        for (DataSetListener dsl : listeners) {
+            dsl.relationMembersChanged(r);
+        }
+    }
+
     public void fireNodeMoved(Node node) {
-        // TODO Fire event
         reindexNode(node);
+        for (DataSetListener dsl : listeners) {
+            dsl.nodeMoved(node);
+        }
     }
 
     public void fireWayNodesChanged(Way way) {
-        // TODO Fire event
         reindexWay(way);
+        for (DataSetListener dsl : listeners) {
+            dsl.wayNodesChanged(way);
+        }
     }
 

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

@@ -492 +492 @@
         }
         setModified(deleted);
+        if (dataSet != null) {
+            if (deleted) {
+                dataSet.firePrimitivesRemoved(Collections.singleton(this));
+            } else {
+                dataSet.firePrimitivesAdded(Collections.singleton(this));
+            }
+        }
     }
 
@@ -774 +781 @@
         updateHasDirectionKeys();
         updateTagged();
+        if (dataSet != null) {
+            dataSet.fireTagsChanged(this);
+        }
     }
 

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

@@ -52 +52 @@
         }
 
+        fireMembersChanged();
     }
 
@@ -80 +81 @@
         members.add(member);
         member.getMember().addReferrer(this);
+        fireMembersChanged();
     }
 
@@ -91 +93 @@
         members.add(index, member);
         member.getMember().addReferrer(this);
+        fireMembersChanged();
     }
 
@@ -105 +108 @@
             member.getMember().addReferrer(this);
             result.getMember().removeReferrer(this);
+            fireMembersChanged();
         }
         return result;
@@ -123 +127 @@
         }
         result.getMember().removeReferrer(this);
+        fireMembersChanged();
         return result;
     }
@@ -264 +269 @@
         primitive.removeReferrer(this);
         members.removeAll(todelete);
+        fireMembersChanged();
     }
 
@@ -298 +304 @@
             primitive.removeReferrer(this);
         }
+        fireMembersChanged();
     }
 
@@ -335 +342 @@
         // Do nothing for now
     }
+
+    private void fireMembersChanged() {
+        if (getDataSet() != null) {
+            getDataSet().fireRelationMembersChanged(this);
+        }
+    }
 }