Changeset 35450 in osm for applications/editors/josm/plugins

Timestamp:

2020-05-15T09:34:10+02:00 (6 years ago)

Author:

gerdp

Message:

see #josm17196: Undo changes inactive layer

• change plugins which use direct access on UndoRedoHandler.getInstance().commands or UndoRedoHandler.getInstance().redoCommands

These fields should be private to allow a refactoring.

File:

• applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java (modified) (1 diff)

applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java

@@ -45 +45 @@
             return;
 
-        Collection<Node> affectableNodes = AlignWaysSegmentMgr.getInstance(
-                MainApplication.getMap().mapView).getSelectedNodes();
+        Collection<Node> affectableNodes = AlignWaysSegmentMgr.getInstance(MainApplication.getMap().mapView)
+                        .getSelectedNodes();
 
         // c is the last command launched, if any
-        Command c = !UndoRedoHandler.getInstance().commands.isEmpty() ? UndoRedoHandler.getInstance().commands
-                .getLast() : null;
+        Command c = UndoRedoHandler.getInstance().getLastCommand();
 
-                // Potentially add my type of command only if last command wasn't my type
-                // or, if it was, the rotated nodes were not the same as now
-                if (!(c instanceof AlignWaysCmdKeepLength && affectableNodes
-                        .equals(((AlignWaysCmdKeepLength) c).getPrevAffectedNodes()))) {
+        // Potentially add my type of command only if last command wasn't my type
+        // or, if it was, the rotated nodes were not the same as now
+        if (!(c instanceof AlignWaysCmdKeepLength
+                && affectableNodes.equals(((AlignWaysCmdKeepLength) c).getPrevAffectedNodes()))) {
 
-                    AlignWaysCmdKeepLength cmdAW;
-                    if (AlignWaysPlugin.getAwDialog().getAwOpt() == AligningModeOption.ALGN_OPT_KEEP_ANGLE) {
-                        cmdAW = new AlignWaysCmdKeepAngles(ds);
-                    } else {
-                        cmdAW = new AlignWaysCmdKeepLength(ds);
-                    }
+            AlignWaysCmdKeepLength cmdAW;
+            if (AlignWaysPlugin.getAwDialog().getAwOpt() == AligningModeOption.ALGN_OPT_KEEP_ANGLE) {
+                cmdAW = new AlignWaysCmdKeepAngles(ds);
+            } else {
+                cmdAW = new AlignWaysCmdKeepLength(ds);
+            }
 
-                    if (cmdAW.executable()) {
-                        // This will also trigger AlignWaysCmdKeepLength.executeCommand()
-                        UndoRedoHandler.getInstance().add(cmdAW);
-                    }
-                }
+            if (cmdAW.executable()) {
+                // This will also trigger AlignWaysCmdKeepLength.executeCommand()
+                UndoRedoHandler.getInstance().add(cmdAW);
+            }
+        }
 
-                MainApplication.getMap().mapView.repaint();
-
-                return;
+        MainApplication.getMap().mapView.repaint();
     }
 }