Changeset 11252 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

see #10387 - refactor actions to fix taginfo script

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (5 diffs)
• actions/PurgeAction.java (modified) (4 diffs)
• tools/RightAndLefthandTraffic.java (modified) (2 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();
+            }
         }
 

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

@@ -72 +72 @@
     protected transient OsmDataLayer layer;
     protected JCheckBox cbClearUndoRedo;
+    protected boolean modified;
 
     protected transient Set<OsmPrimitive> toPurge;
@@ -93 +94 @@
             return;
 
-        doPurge(getLayerManager().getEditDataSet().getAllSelected(), true);
-    }
-
-    /**
-     * Performs purge on selected OSM primitives.
+        PurgeCommand cmd = getPurgeCommand(getLayerManager().getEditDataSet().getAllSelected());
+        boolean clearUndoRedo = false;
+
+        if (!GraphicsEnvironment.isHeadless()) {
+            final boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+                    "purge", Main.parent, buildPanel(modified), tr("Confirm Purging"),
+                    JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_OPTION);
+            if (!answer)
+                return;
+
+            clearUndoRedo = cbClearUndoRedo.isSelected();
+            Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
+        }
+
+        Main.main.undoRedo.add(cmd);
+        if (clearUndoRedo) {
+            Main.main.undoRedo.clean();
+            getLayerManager().getEditDataSet().clearSelectionHistory();
+        }
+    }
+
+    /**
+     * Creates command to purge selected OSM primitives.
      * @param sel selected OSM primitives
-     * @param confirm asks user confirmation through a popup dialog
-     * @since 11240
-     */
-    public void doPurge(Collection<OsmPrimitive> sel, boolean confirm) {
+     * @return command to purge selected OSM primitives
+     * @since 11252
+     */
+    public PurgeCommand getPurgeCommand(Collection<OsmPrimitive> sel) {
         layer = Main.getLayerManager().getEditLayer();
 
@@ -204 +223 @@
         }
 
-        boolean modified = false;
+        modified = false;
         for (OsmPrimitive osm : toPurgeChecked) {
             if (osm.isModified()) {
@@ -212 +231 @@
         }
 
-        boolean clearUndoRedo = false;
-
-        if (!GraphicsEnvironment.isHeadless() && confirm) {
-            final boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
-                    "purge", Main.parent, buildPanel(modified), tr("Confirm Purging"),
-                    JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_OPTION);
-            if (!answer)
-                return;
-
-            clearUndoRedo = cbClearUndoRedo.isSelected();
-            Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
-        }
-
-        Main.main.undoRedo.add(layer != null ? new PurgeCommand(layer, toPurgeChecked, makeIncomplete) :
-            new PurgeCommand(toPurgeChecked.iterator().next().getDataSet(), toPurgeChecked, makeIncomplete));
-
-        if (clearUndoRedo) {
-            Main.main.undoRedo.clean();
-            getLayerManager().getEditDataSet().clearSelectionHistory();
-        }
+        return layer != null ? new PurgeCommand(layer, toPurgeChecked, makeIncomplete) :
+            new PurgeCommand(toPurgeChecked.iterator().next().getDataSet(), toPurgeChecked, makeIncomplete);
     }
 

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -81 +81 @@
      */
     public static synchronized boolean isRightHandTraffic(LatLon ll) {
-        if (rlCache == null) {
-            initialize();
-        }
         return !rlCache.get(ll);
     }
@@ -137 +134 @@
         }
         // Purge all other ways and relations so dataset only contains lefthand traffic data
-        new PurgeAction().doPurge(toPurge, false);
+        new PurgeAction().getPurgeCommand(toPurge).executeCommand();
         // Combine adjacent countries into a single polygon
         Collection<Way> optimizedWays = new ArrayList<>();