Changeset 2622 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

Timestamp:

2009-12-12T20:21:36+01:00 (15 years ago)

Author:

jttt

Message:

Dataset changed events refactored - DatasetEventManager now allows to register listeners to current dataset (no need to reregister when activeLayer is changed, events from current dataset are always returned), possibility to automatically receive events in EDT

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.DataSetListener;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -34 +33 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+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;
 import org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction;
 import org.openstreetmap.josm.gui.layer.DataChangeListener;
@@ -88 +95 @@
     /* Interface DataSetListener                                                   */
     /* --------------------------------------------------------------------------- */
-    public void dataChanged() {
+    public void dataChanged(DataChangedEvent event) {
         // just trigger a repaint - the display name of the relation members may
         // have changed
@@ -96 +103 @@
     }
 
-    public void nodeMoved(Node node) {/* ignore */}
-    public void primtivesAdded(Collection<? extends OsmPrimitive> added) {/* ignore */}
-
-    public void primtivesRemoved(Collection<? extends OsmPrimitive> removed) {
+    public void nodeMoved(NodeMovedEvent event) {/* ignore */}
+    public void primtivesAdded(PrimitivesAddedEvent event) {/* ignore */}
+
+    public void primtivesRemoved(PrimitivesRemovedEvent event) {
         // ignore - the relation in the editor might become out of sync with the relation
         // in the dataset. We will deal with it when the relation editor is closed or
@@ -105 +112 @@
     }
 
-    public void relationMembersChanged(Relation r) {
+    public void relationMembersChanged(RelationMembersChangedEvent event) {
         // ignore - the relation in the editor might become out of sync with the relation
         // in the dataset. We will deal with it when the relation editor is closed or
@@ -111 +118 @@
     }
 
-    public void tagsChanged(OsmPrimitive prim) {
+    public void tagsChanged(TagsChangedEvent event) {
         // just refresh the respective table cells
         //
         Collection<RelationMember> sel = getSelectedMembers();
         for (int i=0; i < members.size();i++) {
-            if (members.get(i).getMember() == prim) {
+            if (members.get(i).getMember() == event.getPrimitive()) {
                 fireTableCellUpdated(i, 1 /* the column with the primitive name */);
             }
@@ -123 +130 @@
     }
 
-    public void wayNodesChanged(Way way) {/* ignore */}
+    public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */}
     /* --------------------------------------------------------------------------- */