Changeset 35452 in osm for applications/editors/josm/plugins/splinex/src/org

Timestamp:

2020-05-15T10:00:32+02:00 (5 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/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java (modified) (3 diffs)

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java

@@ -187 +187 @@
                         + ph.sn.cnext.north()) < EPSILON);
             }
-            if (ph.point == SplinePoint.ENDPOINT && !UndoRedoHandler.getInstance().commands.isEmpty()) {
-                Command cmd = UndoRedoHandler.getInstance().commands.getLast();
+            if (ph.point == SplinePoint.ENDPOINT && UndoRedoHandler.getInstance().hasUndoCommands()) {
+                Command cmd = UndoRedoHandler.getInstance().getLastCommand();
                 if (cmd instanceof MoveCommand) {
                     mc = (MoveCommand) cmd;
@@ -198 +198 @@
                 }
             }
-            if (ph.point != SplinePoint.ENDPOINT && !UndoRedoHandler.getInstance().commands.isEmpty()) {
-                Command cmd = UndoRedoHandler.getInstance().commands.getLast();
+            if (ph.point != SplinePoint.ENDPOINT && UndoRedoHandler.getInstance().hasUndoCommands()) {
+                Command cmd = UndoRedoHandler.getInstance().getLastCommand();
                 if (!(cmd instanceof Spline.EditSplineCommand && ((Spline.EditSplineCommand) cmd).sn == ph.sn))
                     dragControl = true;
@@ -210 +210 @@
         }
         if (spl.isClosed()) return;
-        if (direction == 0)
-            if (spl.nodeCount() < 2)
+        if (direction == 0) {
+            if (spl.nodeCount() < 2) {
                 direction = 1;
-            else
+            } else {
                 return;
+            }
+        }
         Node n = null;
         boolean existing = false;