Changeset 6173 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2013-08-22T00:33:32+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8987 - immutable coordinates (patch by shinigami)

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (2 diffs)
• MoveCommand.java (modified) (7 diffs)
• TransformNodesCommand.java (modified) (4 diffs)

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -51 +53 @@
         public void visit(Relation e) {
             orig.put(e, e.save());
+        }
+    }
+
+    /**
+     * Small helper for holding the interesting part of the old data state of the objects.
+     */
+    public static class OldNodeState {
+
+        final LatLon latlon;
+        final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
+        final boolean modified;
+
+        /**
+         * Constructs a new {@code OldNodeState} for the given node.
+         * @param node The node whose state has to be remembered
+         */
+        public OldNodeState(Node node){
+            latlon = node.getCoor();
+            eastNorth = node.getEastNorth();
+            modified = node.isModified();
         }
     }

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

@@ -9 +9 @@
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.swing.Icon;
 
@@ -48 +49 @@
 
     /**
-     * Small helper for holding the interesting part of the old data state of the
-     * objects.
-     */
-    public static class OldState {
-        LatLon latlon;
-        EastNorth en; // cached EastNorth to be used for applying exact displacenment
-        boolean modified;
-    }
-
-    /**
      * List of all old states of the objects.
      */
-    private List<OldState> oldState = new LinkedList<OldState>();
+    private List<OldNodeState> oldState = new LinkedList<OldNodeState>();
 
     public MoveCommand(OsmPrimitive osm, double x, double y) {
@@ -85 +76 @@
         this.nodes = AllNodesVisitor.getAllNodes(objects);
         for (Node n : this.nodes) {
-            OldState os = new OldState();
-            os.latlon = new LatLon(n.getCoor());
-            os.en = n.getEastNorth();
-            os.modified = n.isModified();
-            oldState.add(os);
-        }
-    }
-
-     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
-         this(objects, end.getX()-start.getX(), end.getY()-start.getY());
-         startEN =  start;
-     }
-
-     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
-         this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
-         startEN =  start;
-     }
+            oldState.add(new OldNodeState(n));
+        }
+    }
+
+    public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
+        this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+        startEN =  start;
+    }
+
+    public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
+        this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+        startEN =  start;
+    }
 
     /**
@@ -135 +122 @@
     }
 
-     /**
+    /**
      * Changes base point of movement
      * @param newDraggedStartPoint - new starting point after movement (where user clicks to start new drag)
@@ -141 +128 @@
     public void changeStartPoint(EastNorth newDraggedStartPoint) {
         startEN = new EastNorth(newDraggedStartPoint.getX()-x, newDraggedStartPoint.getY()-y);
-     }
+    }
 
     /**
@@ -161 +148 @@
 
     private void updateCoordinates() {
-        Iterator<OldState> it = oldState.iterator();
-        for (Node n : nodes) {
-            OldState os = it.next();
-            n.setEastNorth(os.en.add(x, y));
+        Iterator<OldNodeState> it = oldState.iterator();
+        for (Node n : nodes) {
+            OldNodeState os = it.next();
+            n.setEastNorth(os.eastNorth.add(x, y));
         }
     }
@@ -183 +170 @@
 
     @Override public void undoCommand() {
-        Iterator<OldState> it = oldState.iterator();
-        for (Node n : nodes) {
-            OldState os = it.next();
+        Iterator<OldNodeState> it = oldState.iterator();
+        for (Node n : nodes) {
+            OldNodeState os = it.next();
             n.setCoor(os.latlon);
             n.setModified(os.modified);

trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -30 +29 @@
     protected Collection<Node> nodes = new LinkedList<Node>();
 
-    /**
-     * Small helper for holding the interesting part of the old data state of the
-     * nodes.
-     */
-    public static class OldState {
-        LatLon latlon;
-        EastNorth eastNorth;
-        boolean modified;
-    }
 
     /**
      * List of all old states of the nodes.
      */
-    protected Map<Node, OldState> oldStates = new HashMap<Node, OldState>();
+    protected Map<Node, OldNodeState> oldStates = new HashMap<Node, OldNodeState>();
 
     /**
@@ -50 +40 @@
     protected void storeOldState() {
         for (Node n : this.nodes) {
-            OldState os = new OldState();
-            os.latlon = new LatLon(n.getCoor());
-            os.eastNorth = n.getEastNorth();
-            os.modified = n.isModified();
-            oldStates.put(n, os);
+            oldStates.put(n, new OldNodeState(n));
         }
     }
@@ -107 +93 @@
     public void undoCommand() {
         for (Node n : nodes) {
-            OldState os = oldStates.get(n);
+            OldNodeState os = oldStates.get(n);
             n.setCoor(os.latlon);
             n.setModified(os.modified);