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

Timestamp:

2020-03-21T21:27:36+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18962 - introduce DataSet.update to avoid repetitive begin/endUpdate statements

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JoinAreasAction.java (modified) (2 diffs)
• MoveAction.java (modified) (3 diffs)
• SimplifyWayAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (6 diffs)

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

@@ -592 +592 @@
             // revert all executed commands
             ds = executedCmds.getFirst().getAffectedDataSet();
-            ds.beginUpdate();
-            while (!executedCmds.isEmpty()) {
-                executedCmds.removeLast().undoCommand();
-            }
-            ds.endUpdate();
+            ds.update(() -> {
+                while (!executedCmds.isEmpty()) {
+                    executedCmds.removeLast().undoCommand();
+                }
+            });
         }
     }
@@ -1748 +1748 @@
         @Override
         public void undoCommand() {
-            getAffectedDataSet().beginUpdate();
-            super.undoCommand();
-            getAffectedDataSet().endUpdate();
+            getAffectedDataSet().update(super::undoCommand);
         }
 
         @Override
         public boolean executeCommand() {
-            getAffectedDataSet().beginUpdate();
-            boolean rc = super.executeCommand();
-            getAffectedDataSet().endUpdate();
-            return rc;
+            return getAffectedDataSet().update(super::executeCommand);
         }
     }

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

@@ -12 +12 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -98 +97 @@
     }
 
-    @Override
-    public void actionPerformed(ActionEvent event) {
-        DataSet ds = getLayerManager().getEditDataSet();
-
-        if (!MainApplication.isDisplayingMapView() || ds == null)
-            return;
-
-        // find out how many "real" units the objects have to be moved in order to
-        // achive an 1-pixel movement
-
-        MapView mapView = MainApplication.getMap().mapView;
+    /**
+     * Find out how many "real" units the objects have to be moved in order to achieve an 1-pixel movement
+     * @param mapView map view
+     * @return move offset
+     */
+    private EastNorth getOffset(MapView mapView) {
         EastNorth en1 = mapView.getEastNorth(100, 100);
         EastNorth en2 = mapView.getEastNorth(101, 101);
@@ -131 +125 @@
         }
 
+        return new EastNorth(distx, disty);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent event) {
+        DataSet ds = getLayerManager().getEditDataSet();
+
+        if (!MainApplication.isDisplayingMapView() || ds == null)
+            return;
+
+        MapView mapView = MainApplication.getMap().mapView;
+        final EastNorth dist = getOffset(mapView);
+
         Collection<OsmPrimitive> selection = ds.getSelected();
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
 
-        Command c = UndoRedoHandler.getInstance().getLastCommand();
-
-        ds.beginUpdate();
-        try {
+        MoveCommand cmd = ds.update(c -> {
+            MoveCommand moveCmd;
             if (c instanceof MoveCommand && ds.equals(c.getAffectedDataSet())
                     && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-                ((MoveCommand) c).moveAgain(distx, disty);
+                moveCmd = (MoveCommand) c;
+                moveCmd.moveAgain(dist.east(), dist.north());
             } else {
-                c = new MoveCommand(ds, selection, distx, disty);
-                UndoRedoHandler.getInstance().add(c);
+                moveCmd = new MoveCommand(ds, selection, dist.east(), dist.north());
+                UndoRedoHandler.getInstance().add(moveCmd);
             }
-        } finally {
-            ds.endUpdate();
-        }
+            return moveCmd;
+        }, UndoRedoHandler.getInstance().getLastCommand());
 
         for (Node n : affectedNodes) {
             if (n.isLatLonKnown() && n.isOutSideWorld()) {
                 // Revert move
-                ((MoveCommand) c).moveAgain(-distx, -disty);
+                cmd.moveAgain(-dist.east(), -dist.north());
                 JOptionPane.showMessageDialog(
                         MainApplication.getMainFrame(),

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

@@ -172 +172 @@
     public void actionPerformed(ActionEvent e) {
         DataSet ds = getLayerManager().getEditDataSet();
-        ds.beginUpdate();
-        try {
+        ds.update(() -> {
             List<Way> ways = ds.getSelectedWays().stream()
                     .filter(p -> !p.isIncomplete())
@@ -195 +194 @@
                 simplifyWays(ways, err);
             }
-        } finally {
-            ds.endUpdate();
-        }
+        });
     }
 

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

@@ -247 +247 @@
 
     private static void addRemoveSelection(DataSet ds, OsmPrimitive toAdd, OsmPrimitive toRemove) {
-        ds.beginUpdate(); // to prevent the selection listener to screw around with the state
-        try {
+        ds.update(() -> { // to prevent the selection listener to screw around with the state
             addSelection(ds, toAdd);
             clearSelection(ds, toRemove);
-        } finally {
-            ds.endUpdate();
-        }
+        });
     }
 

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

@@ -712 +712 @@
         if (mode == Mode.MOVE) {
             if (startEN == null) return false; // fix #8128
-            ds.beginUpdate();
-            try {
+            return ds.update(() -> {
+                MoveCommand moveCmd = null;
                 if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-                    ((MoveCommand) c).saveCheckpoint();
-                    ((MoveCommand) c).applyVectorTo(currentEN);
+                    moveCmd = (MoveCommand) c;
+                    moveCmd.saveCheckpoint();
+                    moveCmd.applyVectorTo(currentEN);
                 } else if (!selection.isEmpty()) {
-                    c = new MoveCommand(selection, startEN, currentEN);
-                    UndoRedoHandler.getInstance().add(c);
+                    moveCmd = new MoveCommand(selection, startEN, currentEN);
+                    UndoRedoHandler.getInstance().add(moveCmd);
                 }
                 for (Node n : affectedNodes) {
                     if (n.isOutSideWorld()) {
                         // Revert move
-                        if (c instanceof MoveCommand) {
-                            ((MoveCommand) c).resetToCheckpoint();
+                        if (moveCmd != null) {
+                            moveCmd.resetToCheckpoint();
                         }
                         // TODO: We might use a simple notification in the lower left corner.
@@ -737 +738 @@
                     }
                 }
-            } finally {
-                ds.endUpdate();
-            }
+                return true;
+            });
         } else {
             startEN = currentEN; // drag can continue after scaling/rotation
@@ -747 +747 @@
             }
 
-            ds.beginUpdate();
-            try {
+            return ds.update(() -> {
                 if (mode == Mode.ROTATE) {
                     if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
@@ -767 +766 @@
                     MainApplication.getMap().statusLine.setDist(ways);
                 }
-            } finally {
-                ds.endUpdate();
-            }
-        }
-        return true;
+                return true;
+            });
+        }
     }
 
@@ -910 +907 @@
             Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
             Command c = getLastCommandInDataset(ds);
-            ds.beginUpdate();
-            try {
+            ds.update(() -> {
                 if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
                     Node selectedNode = selNodes.iterator().next();
@@ -919 +915 @@
                                                 targetEN.getY() - selectedEN.getY());
                 }
-            } finally {
-                ds.endUpdate();
-            }
+            });
         }