Changeset 3186 in josm

Timestamp:

2010-04-15T19:41:04+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #4601 - Conflict list dialog won't update unless I prod it

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (4 diffs)
• command/MoveCommand.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -78 +78 @@
     private boolean didMove = false;
     private boolean cancelDrawMode = false;
-    Node virtualNode = null;
-    Collection<WaySegment> virtualWays = new ArrayList<WaySegment>();
-    SequenceCommand virtualCmds = null;
+    private Node virtualNode = null;
+    private Collection<WaySegment> virtualWays = new ArrayList<WaySegment>();
 
     /**
@@ -203 +202 @@
             Collection<Command> virtualCmds = new LinkedList<Command>();
             virtualCmds.add(new AddCommand(virtualNode));
-            for(WaySegment virtualWay : virtualWays) {
+            for (WaySegment virtualWay : virtualWays) {
                 Way w = virtualWay.way;
                 Way wnew = new Way(w);
@@ -213 +212 @@
                     "Add and move a virtual new node to {0} ways", virtualWays.size(),
                     virtualWays.size());
-
+            System.err.println("Select Action/mouseDragged "+ Thread.currentThread().getName());
             Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
             selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false, false);
@@ -326 +325 @@
                             virtualWays.add(nearestWS);
                             if(virtualNode == null) {
+                                System.err.println("Select Action/getNearestCollectionVirtual "+ Thread.currentThread().getName());
                                 virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y));
                             }

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

@@ -91 +91 @@
     @Override public boolean executeCommand() {
         for (Node n : nodes) {
+            System.err.println("MoveCommand "+ Thread.currentThread().getName());
             // in case #3892 happens again
             if (n == null)
                 throw new AssertionError("null detected in node list");
             if (n.getEastNorth() == null)
-                throw new AssertionError("unexpected null value for n.getEastNorth(). id of n is" + n.getUniqueId());
+                throw new AssertionError("unexpected null value for n.getEastNorth(). id of n is " + n.getUniqueId());
 
             n.setEastNorth(n.getEastNorth().add(x, y));

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -768 +768 @@
         nodes.remove(node);
         node.setCoorInternal(newCoor);
+//        System.err.println("DataSet/reindexNode "+ Thread.currentThread().getName());
         nodes.add(node);
         for (OsmPrimitive primitive: node.getReferrers()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -44 +44 @@
  * This class is a toggle dialog that can be turned on and off.
  *
- *
  */
 public class ToggleDialog extends JPanel implements Helpful {
@@ -147 +146 @@
                 hideDialog();
                 dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
-                hideNotify();
             } else {
                 showDialog();
@@ -156 +154 @@
                     dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
                 }
-                showNotify();
             }
         }
@@ -181 +178 @@
         toggleAction.putValue("selected", false);
         toggleAction.putValue("selected", true);
+        showNotify();
     }
 
@@ -213 +211 @@
         setIsShowing(false);
         toggleAction.putValue("selected", false);
+        hideNotify();
     }
 
@@ -394 +393 @@
                             hideDialog();
                             dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
-                            hideNotify();
                         }
                     }
@@ -434 +432 @@
                     } else {
                         hideDialog();
-                        hideNotify();
                     }
                 }