Changeset 11252 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2016-11-13T14:49:39+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10387 - refactor actions to fix taginfo script

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (5 diffs)

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

@@ -760 +760 @@
             return;
         case 1:
-            Main.main.undoRedo.add(cmds.getFirst());
+            commitCommand(cmds.getFirst());
             break;
         default:
-            Command c = new SequenceCommand(tr(description), cmds);
-            Main.main.undoRedo.add(c);
+            commitCommand(new SequenceCommand(tr(description), cmds));
             break;
         }
@@ -770 +769 @@
         cmds.clear();
         cmdsCount++;
+    }
+
+    private static void commitCommand(Command c) {
+        if (Main.main != null) {
+            Main.main.undoRedo.add(c);
+        } else {
+            c.executeCommand();
+        }
     }
 
@@ -1279 +1286 @@
             if (!way.insideToTheRight) {
                 ReverseWayResult res = ReverseWayAction.reverseWay(way.way);
-                Main.main.undoRedo.add(res.getReverseCommand());
+                commitCommand(res.getReverseCommand());
                 cmdsCount++;
             }
@@ -1286 +1293 @@
         Pair<Way, Command> result = CombineWayAction.combineWaysWorker(actionWays);
 
-        Main.main.undoRedo.add(result.b);
+        commitCommand(result.b);
         cmdsCount++;
 
@@ -1536 +1543 @@
      */
     private void makeCommitsOneAction(String message) {
-        UndoRedoHandler ur = Main.main.undoRedo;
         cmds.clear();
-        int i = Math.max(ur.commands.size() - cmdsCount, 0);
-        for (; i < ur.commands.size(); i++) {
-            cmds.add(ur.commands.get(i));
-        }
-
-        for (i = 0; i < cmds.size(); i++) {
-            ur.undo();
+        if (Main.main != null) {
+            UndoRedoHandler ur = Main.main.undoRedo;
+            int i = Math.max(ur.commands.size() - cmdsCount, 0);
+            for (; i < ur.commands.size(); i++) {
+                cmds.add(ur.commands.get(i));
+            }
+
+            for (i = 0; i < cmds.size(); i++) {
+                ur.undo();
+            }
         }