Changeset 23 in josm for src/org/openstreetmap/josm/command

Timestamp:

2005-10-27T00:38:03+02:00 (20 years ago)

Author:

imi

Message:

• added commands to support undo later
• added Edit-Layer concept
• painting of deleted objects

Location:

src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (3 diffs)
• CombineAndDeleteCommand.java (added)
• CombineCommand.java (modified) (2 diffs)
• Command.java (modified) (1 diff)
• DeleteCommand.java (added)
• MoveCommand.java (modified) (4 diffs)

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

@@ -43 +43 @@
                 SelectionComponentVisitor v = new SelectionComponentVisitor();
                 osm.visit(v);
-                return new JLabel(v.name, v.icon, JLabel.LEADING);
+                return new JLabel("Add "+v.name, v.icon, JLabel.LEADING);
         }
         
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-                if (!added.contains(osm))
+                if (added != null && !added.contains(osm))
                         added.add(osm);
         }
@@ -65 +65 @@
         public void visit(LineSegment ls) {
                 Main.main.ds.pendingLineSegments.add(ls);
+                Main.main.ds.addBackReference(ls.start, ls);
+                Main.main.ds.addBackReference(ls.end, ls);
         }
 
@@ -74 +76 @@
                 Main.main.ds.tracks.add(t);
                 for (Iterator<LineSegment> it =  Main.main.ds.pendingLineSegments.iterator(); it.hasNext();)
-                        if (t.segments().contains(it.next()))
+                        if (t.segments.contains(it.next()))
                                 it.remove();
+                for (LineSegment ls : t.segments) {
+                        Main.main.ds.addBackReference(ls, t);
+                        Main.main.ds.addBackReference(ls.start, t);
+                        Main.main.ds.addBackReference(ls.end, t);
+                }
         }
 

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

@@ -46 +46 @@
         public void executeCommand() {
                 if (del instanceof LineSegment) {
-                        LineSegment ls = (LineSegment)mod;
-                        Track t = (Track)del;
-                        if (!Main.main.ds.pendingLineSegments().contains(ls))
+                        LineSegment ls = (LineSegment)del;
+                        Track t = (Track)mod;
+                        if (!Main.main.ds.pendingLineSegments.contains(ls))
                                 throw new IllegalStateException("Should not be able to select non-pending line segments.");
                         
                         Main.main.ds.pendingLineSegments.remove(ls);
-                        if (t.getStartingNode() != ls.getEnd())
+                        if (t.getStartingNode() != ls.end)
                                 t.add(ls);
                         else
-                                t.addStart(ls);
+                                t.segments.add(0,ls);
                 } else {
                         Track t1 = (Track)mod;
                         Track t2 = (Track)del;
-                        t1.addAll(t2.segments());
+                        t1.segments.addAll(t2.segments);
                         if (t1.keys == null)
                                 t1.keys = t2.keys;
                         else    
                                 t1.keys.putAll(t2.keys);
-                        t2.destroy();
                         Main.main.ds.tracks.remove(t2);
                 }
+                Main.main.ds.rebuildBackReferences();
         }
 
@@ -82 +82 @@
         
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-                if (!modified.contains(mod))
+                if (modified != null && !modified.contains(mod))
                         modified.add(mod);
-                if (deleted.contains(del))
+                if (deleted != null && deleted.contains(del))
                         throw new IllegalStateException("Deleted object twice: "+del);
                 deleted.add(del);

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

@@ -27 +27 @@
         /**
          * Fill in the changed data this command operates on (for sending to the server).
-         * Add to the lists, don't clear them.
-         * @param modified  The modified primitives
-         * @param deleted   The deleted primitives
-         * @param added         The added primitives
+         * Add to the lists, don't clear them. The lists can be <code>null</code>
+         * in which case they are ignored.
+         * 
+         * @param modified  The modified primitives or <code>null</code>
+         * @param deleted   The deleted primitives or <code>null</code>
+         * @param added         The added primitives or <code>null</code>
          */
         void fillModifiedData(Collection<OsmPrimitive> modified,

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

@@ -3 +3 @@
 import java.awt.Component;
 import java.util.Collection;
-import java.util.HashSet;
 
 import javax.swing.JLabel;
@@ -9 +8 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
 
 /**
@@ -49 +49 @@
 
         public void executeCommand() {
-                Collection<Node> movingNodes = new HashSet<Node>();
+                AllNodesVisitor visitor = new AllNodesVisitor();
                 for (OsmPrimitive osm : objects)
-                        movingNodes.addAll(osm.getAllNodes());
-                for (Node n : movingNodes) {
+                        osm.visit(visitor);
+                for (Node n : visitor.nodes) {
                         n.coor.x += x;
                         n.coor.y += y;
@@ -65 +65 @@
 
         public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-                for (OsmPrimitive osm : objects)
-                        if (!modified.contains(osm))
-                                modified.add(osm);
+                if (modified != null)
+                        for (OsmPrimitive osm : objects)
+                                if (!modified.contains(osm))
+                                        modified.add(osm);
         }
 }