Changeset 22 in josm for src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java

Timestamp:

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

Author:

imi

Message:

starting restructure of dataset. Checkpoint is broken!

File:

• src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java (modified) (4 diffs)

src/org/openstreetmap/josm/actions/mapmode/AddTrackAction.java

@@ -6 +6 @@
 import java.util.LinkedList;
 
-import org.openstreetmap.josm.command.DataSet;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -76 +78 @@
                         return; // not allowed together
 
-                DataSet ds = mv.getActiveDataSet();
-                
                 if (!ctrl && !shift)
-                        ds.clearSelection(); // new selection will replace the old.
+                        Main.main.ds.clearSelection(); // new selection will replace the old.
 
                 Collection<OsmPrimitive> selectionList = selectionManager.getObjectsInRectangle(r,alt);
                 for (OsmPrimitive osm : selectionList)
-                        osm.setSelected(!ctrl, ds);
+                        osm.setSelected(!ctrl);
 
                 mv.repaint(); // from now on, the map has to be repainted.
@@ -90 +90 @@
                         return; // no new track yet.
                 
-                Collection<OsmPrimitive> selection = ds.getSelected();
+                Collection<OsmPrimitive> selection = Main.main.ds.getSelected();
                 if (selection.isEmpty())
                         return;
@@ -104 +104 @@
                 Track t = new Track();
                 for (LineSegment ls : lineSegments)
-                        ds.assignPendingLineSegment(ls, t, true);
-                ds.addTrack(t);
-                ds.clearSelection();
+                        t.add(ls);
+                Command c = new AddCommand(t);
+                c.executeCommand();
+                Main.main.commands.add(c);
+                Main.main.ds.clearSelection();
         }