Changeset 13736 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-05-13T01:32:56+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16260 - fix build

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (6 diffs)
• data/UndoRedoHandler.java (modified) (4 diffs)
• tools/RightAndLefthandTraffic.java (modified) (2 diffs)

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

@@ -63 +63 @@
     private DataSet ds;
     private final transient List<Relation> addedRelations = new LinkedList<>();
+    private final boolean addUndoRedo;
 
     /**
@@ -457 +458 @@
     /**
      * Constructs a new {@code JoinAreasAction} with optional shortcut and adapters.
-     * @param addShortcutToolbarAdapters controls whether the shortcut should be registered or not, as for toolbar registration and adapters
+     * @param addShortcutToolbarAdapters controls whether the shortcut should be registered or not,
+     * as for toolbar registration, adapters creation and undo/redo integration
      * @since 11611
      */
@@ -464 +466 @@
         Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
         : null, addShortcutToolbarAdapters, null, addShortcutToolbarAdapters);
+        addUndoRedo = addShortcutToolbarAdapters;
     }
 
@@ -566 +569 @@
             //FIXME: this is dirty hack
             makeCommitsOneAction(tr("Reverting changes"));
-            MainApplication.undoRedo.undo();
-            MainApplication.undoRedo.redoCommands.clear();
+            if (addUndoRedo) {
+                MainApplication.undoRedo.undo();
+                MainApplication.undoRedo.redoCommands.clear();
+            }
         }
     }
@@ -828 +833 @@
     }
 
-    private static void commitCommand(Command c) {
-        if (Main.main != null) {
+    private void commitCommand(Command c) {
+        if (Main.main != null && addUndoRedo) {
             MainApplication.undoRedo.add(c);
         } else {
@@ -1596 +1601 @@
     private void makeCommitsOneAction(String message) {
         cmds.clear();
-        if (Main.main != null) {
+        if (Main.main != null && addUndoRedo) {
             UndoRedoHandler ur = MainApplication.undoRedo;
             int i = Math.max(ur.commands.size() - cmdsCount, 0);

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -107 +107 @@
     /**
      * Event fired after a command has been added to the command queue.
-     * @since xxx
+     * @since 13729
      */
     public static final class CommandAddedEvent extends CommandQueueEvent {
@@ -134 +134 @@
     /**
      * Event fired after the command queue has been cleaned.
-     * @since xxx
+     * @since 13729
      */
     public static final class CommandQueueCleanedEvent extends CommandQueueEvent {
@@ -161 +161 @@
     /**
      * Event fired after a command has been undone.
-     * @since xxx
+     * @since 13729
      */
     public static final class CommandUndoneEvent extends CommandQueueEvent {
@@ -188 +188 @@
     /**
      * Event fired after a command has been redone.
-     * @since xxx
+     * @since 13729
      */
     public static final class CommandRedoneEvent extends CommandQueueEvent {

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
@@ -136 +135 @@
             optimizedWays.addAll(ways);
         }
-        // Clean command stack
-        MainApplication.undoRedo.clean(data);
         return optimizedWays;
     }