Changeset 35452 in osm for applications/editors/josm/plugins/utilsplugin2

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.

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection

Files:

• SelectModNodesAction.java (modified) (2 diffs)
• SelectModWaysAction.java (modified) (2 diffs)

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();