- Timestamp:
- 2010-04-15T19:41:04+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r3177 r3186 78 78 private boolean didMove = false; 79 79 private boolean cancelDrawMode = false; 80 Node virtualNode = null; 81 Collection<WaySegment> virtualWays = new ArrayList<WaySegment>(); 82 SequenceCommand virtualCmds = null; 80 private Node virtualNode = null; 81 private Collection<WaySegment> virtualWays = new ArrayList<WaySegment>(); 83 82 84 83 /** … … 203 202 Collection<Command> virtualCmds = new LinkedList<Command>(); 204 203 virtualCmds.add(new AddCommand(virtualNode)); 205 for (WaySegment virtualWay : virtualWays) {204 for (WaySegment virtualWay : virtualWays) { 206 205 Way w = virtualWay.way; 207 206 Way wnew = new Way(w); … … 213 212 "Add and move a virtual new node to {0} ways", virtualWays.size(), 214 213 virtualWays.size()); 215 214 System.err.println("Select Action/mouseDragged "+ Thread.currentThread().getName()); 216 215 Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds)); 217 216 selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false, false); … … 326 325 virtualWays.add(nearestWS); 327 326 if(virtualNode == null) { 327 System.err.println("Select Action/getNearestCollectionVirtual "+ Thread.currentThread().getName()); 328 328 virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y)); 329 329 } -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r3173 r3186 91 91 @Override public boolean executeCommand() { 92 92 for (Node n : nodes) { 93 System.err.println("MoveCommand "+ Thread.currentThread().getName()); 93 94 // in case #3892 happens again 94 95 if (n == null) 95 96 throw new AssertionError("null detected in node list"); 96 97 if (n.getEastNorth() == null) 97 throw new AssertionError("unexpected null value for n.getEastNorth(). id of n is " + n.getUniqueId());98 throw new AssertionError("unexpected null value for n.getEastNorth(). id of n is " + n.getUniqueId()); 98 99 99 100 n.setEastNorth(n.getEastNorth().add(x, y)); -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r3177 r3186 768 768 nodes.remove(node); 769 769 node.setCoorInternal(newCoor); 770 // System.err.println("DataSet/reindexNode "+ Thread.currentThread().getName()); 770 771 nodes.add(node); 771 772 for (OsmPrimitive primitive: node.getReferrers()) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r3178 r3186 44 44 * This class is a toggle dialog that can be turned on and off. 45 45 * 46 *47 46 */ 48 47 public class ToggleDialog extends JPanel implements Helpful { … … 147 146 hideDialog(); 148 147 dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null); 149 hideNotify();150 148 } else { 151 149 showDialog(); … … 156 154 dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this); 157 155 } 158 showNotify();159 156 } 160 157 } … … 181 178 toggleAction.putValue("selected", false); 182 179 toggleAction.putValue("selected", true); 180 showNotify(); 183 181 } 184 182 … … 213 211 setIsShowing(false); 214 212 toggleAction.putValue("selected", false); 213 hideNotify(); 215 214 } 216 215 … … 394 393 hideDialog(); 395 394 dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null); 396 hideNotify();397 395 } 398 396 } … … 434 432 } else { 435 433 hideDialog(); 436 hideNotify();437 434 } 438 435 }
Note:
See TracChangeset
for help on using the changeset viewer.