Changeset 10467 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-06-24T00:30:42+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AddNodeAction.java (modified) (1 diff)
• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (1 diff)
• CreateCircleAction.java (modified) (1 diff)
• DistributeAction.java (modified) (1 diff)
• ImageryAdjustAction.java (modified) (2 diffs)
• JoinNodeWayAction.java (modified) (1 diff)
• MirrorAction.java (modified) (1 diff)
• OrthogonalizeAction.java (modified) (2 diffs)
• ReverseWayAction.java (modified) (1 diff)
• SimplifyWayAction.java (modified) (1 diff)
• UnJoinNodeWayAction.java (modified) (1 diff)
• downloadtasks/DownloadReferrersTask.java (modified) (1 diff)
• mapmode/DeleteAction.java (modified) (3 diffs)
• mapmode/DrawAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

@@ -66 +66 @@
         Main.main.undoRedo.add(new AddCommand(nnew));
         getLayerManager().getEditDataSet().setSelected(nnew);
-        if (Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
-            Main.map.mapView.repaint();
-        } else {
-            AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
+        if (Main.map.mapView != null) {
+            if (Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
+                Main.map.mapView.repaint();
+            } else {
+                AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
+            }
         }
     }

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -284 +284 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -205 +205 @@
             // Do it!
             Main.main.undoRedo.add(cmd);
-            Main.map.repaint();
 
         } catch (InvalidSelection except) {

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -241 +241 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

@@ -98 +98 @@
         // Do it!
         Main.main.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -137 +137 @@
             }
             kev.consume();
-            Main.map.repaint();
         }
     }
@@ -164 +163 @@
             offsetDialog.updateOffset();
         }
-        Main.map.repaint();
         prevEastNorth = eastNorth;
     }

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -160 +160 @@
         if (cmds.isEmpty()) return;
         Main.main.undoRedo.add(new SequenceCommand(getValue(NAME).toString(), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

@@ -81 +81 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -113 +113 @@
                 if (!commands.isEmpty()) {
                     Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
-                    Main.map.repaint();
                 } else {
                     throw new InvalidUserInputException("Commands are empty");
@@ -153 +152 @@
             final SequenceCommand command = orthogonalize(sel);
             Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize"), command));
-            Main.map.repaint();
         } catch (InvalidUserInputException ex) {
             Main.debug(ex);

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -103 +103 @@
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
+        // FIXME: This should be handled by undoRedo.
         if (propertiesUpdated) {
             ds.fireSelectionChanged();
         }
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -124 +124 @@
             ds.endUpdate();
         }
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

@@ -91 +91 @@
         // I'm sure there's a better way to handle this
         Main.main.undoRedo.add(new RemoveNodesCommand(selectedWay, selectedNodes));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -122 +122 @@
                     public void run() {
                         targetLayer.onPostDownloadFromServer();
-                        if (Main.map != null)
-                            Main.map.mapView.repaint();
                     }
                 }

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

@@ -134 +134 @@
      */
     public static void doActionPerformed(ActionEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
-            return;
+        MainLayerManager lm = Main.getLayerManager();
+        OsmDataLayer editLayer = lm.getEditLayer();
+        if (editLayer == null) {
+            return;
+        }
+
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
         boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
 
-        MainLayerManager lm = Main.getLayerManager();
         Command c;
         if (ctrl) {
-            c = DeleteCommand.deleteWithReferences(lm.getEditLayer(), lm.getEditDataSet().getSelected());
+            c = DeleteCommand.deleteWithReferences(editLayer, lm.getEditDataSet().getSelected());
         } else {
-            c = DeleteCommand.delete(lm.getEditLayer(), lm.getEditDataSet().getSelected(), !alt /* also delete nodes in way */);
+            c = DeleteCommand.delete(editLayer, lm.getEditDataSet().getSelected(), !alt /* also delete nodes in way */);
         }
         // if c is null, an error occurred or the user aborted. Don't do anything in that case.
         if (c != null) {
             Main.main.undoRedo.add(c);
+            //FIXME: This should not be required, DeleteCommand should update the selection, otherwise undo/redo won't work.
             lm.getEditDataSet().setSelected();
-            Main.map.repaint();
         }
     }
@@ -213 +216 @@
     private void repaintIfRequired(Set<OsmPrimitive> newHighlights, WaySegment newHighlightedWaySegment) {
         boolean needsRepaint = false;
-        DataSet ds = getLayerManager().getEditDataSet();
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
 
         if (newHighlightedWaySegment == null && oldHighlightedWaySegment != null) {
-            if (ds != null) {
-                ds.clearHighlightedWaySegments();
+            if (editLayer != null) {
+                editLayer.data.clearHighlightedWaySegments();
                 needsRepaint = true;
             }
             oldHighlightedWaySegment = null;
         } else if (newHighlightedWaySegment != null && !newHighlightedWaySegment.equals(oldHighlightedWaySegment)) {
-            if (ds != null) {
-                ds.setHighlightedWaySegments(Collections.singleton(newHighlightedWaySegment));
+            if (editLayer != null) {
+                editLayer.data.setHighlightedWaySegments(Collections.singleton(newHighlightedWaySegment));
                 needsRepaint = true;
             }
@@ -229 +232 @@
         }
         needsRepaint |= highlightHelper.highlightOnly(newHighlights);
-        if (needsRepaint) {
-            Main.map.mapView.repaint();
+        if (needsRepaint && editLayer != null) {
+            editLayer.invalidate();
         }
     }

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

@@ -185 +185 @@
 
         // update selection to reflect which way being modified
-        DataSet currentDataSet = getLayerManager().getEditDataSet();
-        if (getCurrentBaseNode() != null && currentDataSet != null && !currentDataSet.selectionEmpty()) {
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        if (getCurrentBaseNode() != null && editLayer != null && !editLayer.data.selectionEmpty()) {
+            DataSet currentDataSet = editLayer.data;
             Way continueFrom = getWayForNode(getCurrentBaseNode());
             if (alt && continueFrom != null && (!getCurrentBaseNode().isSelected() || continueFrom.isSelected())) {
@@ -197 +198 @@
         }
 
-        if (needsRepaint) {
-            Main.map.mapView.repaint();
+        if (needsRepaint && editLayer != null) {
+            editLayer.invalidate();
         }
         return needsRepaint;
@@ -917 +918 @@
     @Override
     public void mouseExited(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        if (editLayer == null)
             return;
         mousePos = e.getPoint();
@@ -925 +927 @@
         // caused one already, don’t do it again.
         if (!repaintIssued) {
-            Main.map.mapView.repaint();
+            editLayer.invalidate();
         }
     }