Changeset 86 in josm for src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import java.util.HashSet;
 
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
@@ -12 +12 @@
  * @author imi
  */
-public class DeleteCommand implements Command {
+public class DeleteCommand extends Command {
 
-        /**
-         * The dataset this command operates on.
-         */
-        final DataSet ds;
         /**
          * The primitive that get deleted.
@@ -23 +19 @@
         final Collection<OsmPrimitive> data = new HashSet<OsmPrimitive>();
 
-        public DeleteCommand(DataSet ds, OsmPrimitive osm) {
-                this.ds = ds;
-                CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(ds);
+        public DeleteCommand(OsmPrimitive osm) {
+                CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds);
                 osm.visit(v);
                 data.addAll(v.data);
@@ -31 +26 @@
         }
         
-        public void executeCommand() {
+        @Override public void executeCommand() {
+                super.executeCommand();
                 for (OsmPrimitive osm : data)
-                        osm.setDeleted(true);
+                        osm.delete(true);
         }
 
-        public void undoCommand() {
-                for (OsmPrimitive osm : data)
-                        osm.setDeleted(false);
-        }
-
-        public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+        @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
                 deleted.addAll(data);
         }