Changeset 343 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2007-10-07T13:20:27+02:00 (17 years ago)

Author:

gebner

Message:

Merge 0.5.

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (2 diffs)
• ChangeCommand.java (modified) (1 diff)
• Command.java (modified) (2 diffs)
• DeleteCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/AddCommand.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
@@ -22 +23 @@
  * A command that adds an osm primitive to a dataset. Keys cannot be added this
  * way. Use ChangeKeyValueCommand instead.
+ * 
+ * See ChangeCommand for comments on relation back references.
  * 
  * @author imi

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 
+/**
+ * Command that basically replaces one OSM primitive by another of the 
+ * same type.
+ *  
+ * @author Imi
+ */
 public class ChangeCommand extends Command {
 

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -37 +37 @@
                         orig.put(n, new Node(n));
                 }
-                public void visit(Segment s) {
-                        orig.put(s, new Segment(s));
-                }
                 public void visit(Way w) {
                         orig.put(w, new Way(w));
+                }
+                public void visit(Relation e) {
+                        orig.put(e, new Relation(e));
                 }
         }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -11 +11 @@
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
@@ -32 +33 @@
         @Override public void executeCommand() {
                 super.executeCommand();
-                for (OsmPrimitive osm : data)
+                for (OsmPrimitive osm : data) {
                         osm.delete(true);
+                }
         }
-
+        
         @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 deleted.addAll(data);