Changeset 6173 in josm for trunk/src/org/openstreetmap/josm/command/MoveCommand.java
- Timestamp:
- 2013-08-22T00:33:32+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r6069 r6173 9 9 import java.util.LinkedList; 10 10 import java.util.List; 11 11 12 import javax.swing.Icon; 12 13 … … 48 49 49 50 /** 50 * Small helper for holding the interesting part of the old data state of the51 * objects.52 */53 public static class OldState {54 LatLon latlon;55 EastNorth en; // cached EastNorth to be used for applying exact displacenment56 boolean modified;57 }58 59 /**60 51 * List of all old states of the objects. 61 52 */ 62 private List<Old State> oldState = new LinkedList<OldState>();53 private List<OldNodeState> oldState = new LinkedList<OldNodeState>(); 63 54 64 55 public MoveCommand(OsmPrimitive osm, double x, double y) { … … 85 76 this.nodes = AllNodesVisitor.getAllNodes(objects); 86 77 for (Node n : this.nodes) { 87 OldState os = new OldState(); 88 os.latlon = new LatLon(n.getCoor()); 89 os.en = n.getEastNorth(); 90 os.modified = n.isModified(); 91 oldState.add(os); 92 } 93 } 94 95 public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) { 96 this(objects, end.getX()-start.getX(), end.getY()-start.getY()); 97 startEN = start; 98 } 99 100 public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) { 101 this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY()); 102 startEN = start; 103 } 78 oldState.add(new OldNodeState(n)); 79 } 80 } 81 82 public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) { 83 this(objects, end.getX()-start.getX(), end.getY()-start.getY()); 84 startEN = start; 85 } 86 87 public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) { 88 this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY()); 89 startEN = start; 90 } 104 91 105 92 /** … … 135 122 } 136 123 137 124 /** 138 125 * Changes base point of movement 139 126 * @param newDraggedStartPoint - new starting point after movement (where user clicks to start new drag) … … 141 128 public void changeStartPoint(EastNorth newDraggedStartPoint) { 142 129 startEN = new EastNorth(newDraggedStartPoint.getX()-x, newDraggedStartPoint.getY()-y); 143 130 } 144 131 145 132 /** … … 161 148 162 149 private void updateCoordinates() { 163 Iterator<Old State> it = oldState.iterator();164 for (Node n : nodes) { 165 Old State os = it.next();166 n.setEastNorth(os.e n.add(x, y));150 Iterator<OldNodeState> it = oldState.iterator(); 151 for (Node n : nodes) { 152 OldNodeState os = it.next(); 153 n.setEastNorth(os.eastNorth.add(x, y)); 167 154 } 168 155 } … … 183 170 184 171 @Override public void undoCommand() { 185 Iterator<Old State> it = oldState.iterator();186 for (Node n : nodes) { 187 Old State os = it.next();172 Iterator<OldNodeState> it = oldState.iterator(); 173 for (Node n : nodes) { 174 OldNodeState os = it.next(); 188 175 n.setCoor(os.latlon); 189 176 n.setModified(os.modified);
Note:
See TracChangeset
for help on using the changeset viewer.