Changeset 35452 in osm

Timestamp:

2020-05-15T10:00:32+02:00 (4 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.

Location:

applications/editors/josm/plugins

Files:

• reverter/src/reverter/ReverterUploadHook.java (modified) (1 diff)
• splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java (modified) (3 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java

@@ -28 +28 @@
     public boolean checkUpload(APIDataSet apiDataSet) {
         if (ReverterPlugin.reverterUsed) {
-            for (Command cmd : UndoRedoHandler.getInstance().commands) {
+            for (Command cmd : UndoRedoHandler.getInstance().getUndoCommands()) {
                 if (isReverterCmd(cmd)) {
                     MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", pluginString);

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;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -41 +41 @@
             Command cmd = null;
 
-            if (UndoRedoHandler.getInstance().commands == null) return;
-            int num = UndoRedoHandler.getInstance().commands.size();
+            int num = UndoRedoHandler.getInstance().getUndoCommands().size();
             if (num == 0) return;
             int k = 0, idx;
             // check if executed again, we cycle through all available commands
             if (lastCmd != null && !selection.isEmpty()) {
-                idx = UndoRedoHandler.getInstance().commands.lastIndexOf(lastCmd);
+                idx = UndoRedoHandler.getInstance().getUndoCommands().lastIndexOf(lastCmd);
             } else {
                 idx = num;
@@ -55 +54 @@
             do {  //  select next history element
                 if (idx > 0) idx--; else idx = num-1;
-                cmd = UndoRedoHandler.getInstance().commands.get(idx);
+                cmd = UndoRedoHandler.getInstance().getUndoCommands().get(idx);
                 if (cmd.getAffectedDataSet() == ds) {
                     Collection<? extends OsmPrimitive> pp = cmd.getParticipatingPrimitives();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -40 +40 @@
             Command cmd;
 
-            if (UndoRedoHandler.getInstance().commands == null) return;
-            int num = UndoRedoHandler.getInstance().commands.size();
+            int num = UndoRedoHandler.getInstance().getUndoCommands().size();
             if (num == 0) return;
             int k = 0, idx;
             // check if executed again, we cycle through all available commands
             if (lastCmd != null && !ds.getSelectedWays().isEmpty()) {
-                idx = UndoRedoHandler.getInstance().commands.lastIndexOf(lastCmd);
+                idx = UndoRedoHandler.getInstance().getUndoCommands().lastIndexOf(lastCmd);
             } else {
                 idx = num;
@@ -54 +53 @@
             do {  //  select next history element
                 if (idx > 0) idx--; else idx = num-1;
-                cmd = UndoRedoHandler.getInstance().commands.get(idx);
+                cmd = UndoRedoHandler.getInstance().getUndoCommands().get(idx);
                 if (cmd.getAffectedDataSet() == ds) {
                     Collection<? extends OsmPrimitive> pp = cmd.getParticipatingPrimitives();