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

Timestamp:

2006-04-21T14:31:51+02:00 (20 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/SequenceCommand.java (modified) (2 diffs)

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

@@ -10 +10 @@
  * @author imi
  */
-public class SequenceCommand implements Command {
+public class SequenceCommand extends Command {
 
         /**
@@ -26 +26 @@
         }
         
-        public void executeCommand() {
+        @Override public void executeCommand() {
                 for (Command c : sequenz)
                         c.executeCommand();
         }
 
-        public void undoCommand() {
+        @Override public void undoCommand() {
                 for (int i = sequenz.length-1; i >= 0; --i)
                         sequenz[i].undoCommand();
         }
 
-        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) {
                 for (Command c : sequenz)
                         c.fillModifiedData(modified, deleted, added);