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

Timestamp:

2005-10-23T22:13:33+02:00 (20 years ago)

Author:

imi

Message:

starting restructure of dataset. Checkpoint is broken!

Location:

src/org/openstreetmap/josm/command

Files:

• AddCommand.java (modified) (6 diffs)
• CombineCommand.java (added)
• Command.java (modified) (2 diffs)
• DataSet.java (modified) (3 diffs)
• MoveCommand.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import java.awt.Component;
+import java.util.Collection;
 import java.util.Iterator;
 
 import javax.swing.JLabel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Key;
 import org.openstreetmap.josm.data.osm.LineSegment;
@@ -26 +28 @@
          */
         private final OsmPrimitive osm;
-        /**
-         * The dataset to add the primitive to.
-         */
-        private final DataSet ds;
 
         /**
          * Create the command and specify the element to add.
          */
-        public AddCommand(OsmPrimitive osm, DataSet dataSet) {
+        public AddCommand(OsmPrimitive osm) {
                 this.osm = osm;
-                this.ds = dataSet;
         }
 
@@ -42 +39 @@
                 osm.visit(this);
         }
-
+        
         public Component commandDescription() {
                 SelectionComponentVisitor v = new SelectionComponentVisitor();
                 osm.visit(v);
                 return new JLabel(v.name, v.icon, JLabel.LEADING);
+        }
+        
+        public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+                if (!added.contains(osm))
+                        added.add(osm);
         }
 
@@ -54 +56 @@
          */
         public void visit(Node n) {
-                ds.nodes.add(n);
+                Main.main.ds.nodes.add(n);
         }
 
@@ -62 +64 @@
          */
         public void visit(LineSegment ls) {
-                ds.pendingLineSegments.add(ls);
+                Main.main.ds.pendingLineSegments.add(ls);
         }
 
@@ -70 +72 @@
          */
         public void visit(Track t) {
-                ds.addTrack(t);
-                for (Iterator<LineSegment> it =  ds.pendingLineSegments.iterator(); it.hasNext();)
+                Main.main.ds.tracks.add(t);
+                for (Iterator<LineSegment> it =  Main.main.ds.pendingLineSegments.iterator(); it.hasNext();)
                         if (t.segments().contains(it.next()))
                                 it.remove();

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

@@ -2 +2 @@
 
 import java.awt.Component;
+import java.util.Collection;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 
 /**
  * Classes implementing Command modify a dataset in a specific way. A command is
- * one atomic action on a dataset, such as move or delete.
+ * one atomic action on a specific dataset, such as move or delete.
  *
  * @author imi
@@ -16 +19 @@
          */
         void executeCommand();
-        
+
         /**
          * Give a description of the command as component to draw
          */
         Component commandDescription();
+        
+        /**
+         * 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
+         */
+        void fillModifiedData(Collection<OsmPrimitive> modified,
+                        Collection<OsmPrimitive> deleted,
+                        Collection<OsmPrimitive> added);
 }

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

@@ -205 +205 @@
          */
         public void mergeFrom(DataSet ds, boolean mergeEqualNodes) {
-                System.out.println(nodes.size()+" "+pendingLineSegments.size()+" "+tracks.size());
-                if (mergeEqualNodes) {
+                if (mergeEqualNodes && !nodes.isEmpty()) {
                         Map<Node, Node> mergeMap = new HashMap<Node, Node>();
                         Set<Node> nodesToAdd = new HashSet<Node>();
@@ -247 +246 @@
                         pendingLineSegments.addAll(ds.pendingLineSegments);
                 }
-                System.out.println(nodes.size()+" "+pendingLineSegments.size()+" "+tracks.size());
         }
 
@@ -258 +256 @@
                         return;
                 for (OsmPrimitive osm : list) {
-                        osm.setSelected(false, this);
+                        osm.setSelected(false);
                         if (osm.keys != null)
                                 clearSelection(osm.keys.keySet());

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

@@ -63 +63 @@
                 return new JLabel("Move "+objects.size()+" primitives "+xstr+" "+ystr);
         }
+
+        public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+                for (OsmPrimitive osm : objects)
+                        if (!modified.contains(osm))
+                                modified.add(osm);
+        }
 }