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

Timestamp:

2009-07-19T19:04:49+02:00 (17 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• DataSetChecker.java (modified) (1 diff)
• UndoRedoHandler.java (modified) (3 diffs)
• osm/DataSet.java (modified) (3 diffs)
• osm/Node.java (modified) (1 diff)
• osm/OsmPrimitiveType.java (modified) (1 diff)
• osm/visitor/AddVisitor.java (deleted)
• osm/visitor/DeleteVisitor.java (deleted)
• osm/visitor/NameVisitor.java (deleted)

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

@@ -33 +33 @@
         if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
             OsmDataLayer l = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            if (l.data != Main.ds) {
+            if (l.data != Main.main.getCurrentDataSet()) {
                 JOptionPane.showMessageDialog(Main.parent, "Main.ds / active layer mismatch");
                 return;

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

@@ -62 +62 @@
         }
         fireCommandsChanged();
-        Main.ds.setSelected();
+        Main.main.getCurrentDataSet().setSelected();
     }
 
@@ -84 +84 @@
 
     public void fireCommandsChanged() {
-        for (final CommandQueueListener l : listenerCommands)
+        for (final CommandQueueListener l : listenerCommands) {
             l.commandChanged(commands.size(), redoCommands.size());
+        }
     }
 
@@ -108 +109 @@
             }
         }
-        if (changed)
+        if (changed) {
             fireCommandsChanged();
+        }
     }
 

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

@@ -105 +105 @@
     }
 
-    public void addPrimitive(OsmPrimitive osm) {
-        if (osm instanceof Node) {
-            nodes.add((Node) osm);
-        } else if (osm instanceof Way) {
-            ways.add((Way) osm);
-        } else if (osm instanceof Relation) {
-            relations.add((Relation) osm);
+    /**
+     * Adds a primitive to the dataset
+     * 
+     * @param primitive the primitive. Ignored if null.
+     */
+    public void addPrimitive(OsmPrimitive primitive) {
+        if (primitive == null)
+            return;
+        if (primitive instanceof Node) {
+            nodes.add((Node) primitive);
+        } else if (primitive instanceof Way) {
+            ways.add((Way) primitive);
+        } else if (primitive instanceof Relation) {
+            relations.add((Relation) primitive);
+        }
+    }
+
+    /**
+     * Removes a primitive from the dataset. This method only removes the
+     * primitive form the respective collection of primitives managed
+     * by this dataset, i.e. from {@see #nodes}, {@see #ways}, or
+     * {@see #relations}. References from other primitives to this
+     * primitive are left unchanged.
+     * 
+     * @param primitive the primitive. Ignored if null.
+     */
+    public void removePrimitive(OsmPrimitive primitive) {
+        if (primitive == null)
+            return;
+        if (primitive instanceof Node) {
+            nodes.remove(primitive);
+        } else if (primitive instanceof Way) {
+            ways.remove(primitive);
+        } else if (primitive instanceof Relation) {
+            relations.remove(primitive);
         }
     }
@@ -120 +148 @@
         return sel;
     }
+
+
     /**
      * Return a list of all selected objects. Even keys are returned.
@@ -391 +421 @@
         }
     }
+
+
 }

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

@@ -140 +140 @@
         return name;
     }
-
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.ImageIcon;
 
 public enum OsmPrimitiveType {