Changeset 11611 in josm

Timestamp:

2017-02-25T14:05:29+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14123 - On first startup: Registered toolbar action overwritten

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• actions/PurgeAction.java (modified) (3 diffs)
• tools/RightAndLefthandTraffic.java (modified) (2 diffs)

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

@@ -449 +449 @@
      */
     public JoinAreasAction() {
-        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"),
-        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")),
-            KeyEvent.VK_J, Shortcut.SHIFT), true);
+        this(true);
+    }
+
+    /**
+     * Constructs a new {@code JoinAreasAction} with optional shortcut.
+     * @param addShortcut controls whether the shortcut should be registered or not
+     * @since 11611
+     */
+    public JoinAreasAction(boolean addShortcut) {
+        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), addShortcut ?
+        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
+        : null, true);
     }
 

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

@@ -53 +53 @@
  *
  * This action is undo-able. In order not to break previous commands in the
- * undo buffer, we must re-add the identical object (and not semantically
- * equal ones).
+ * undo buffer, we must re-add the identical object (and not semantically equal ones).
+ *
+ * @since 3431
  */
 public class PurgeAction extends JosmAction {
@@ -68 +69 @@
     protected transient Set<OsmPrimitive> toPurgeChecked;
     /**
-     * Subset of toPurgeChecked. Marks primitives that remain in the
-     * dataset, but incomplete.
+     * Subset of toPurgeChecked. Marks primitives that remain in the dataset, but incomplete.
      */
     protected transient Set<OsmPrimitive> makeIncomplete;
@@ -81 +81 @@
      */
     public PurgeAction() {
+        this(true);
+    }
+
+    /**
+     * Constructs a new {@code PurgeAction} with optional shortcut.
+     * @param addShortcut controls whether the shortcut should be registered or not
+     * @since 11611
+     */
+    public PurgeAction(boolean addShortcut) {
         /* translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune" */
-        super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."),
-                Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")),
-                KeyEvent.VK_P, Shortcut.CTRL_SHIFT),
-                true);
+        super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."), addShortcut ?
+                Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")), KeyEvent.VK_P, Shortcut.CTRL_SHIFT)
+                : null, true);
         putValue("help", HelpUtil.ht("/Action/Purge"));
     }

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

@@ -104 +104 @@
         }
         // Purge all other ways and relations so dataset only contains lefthand traffic data
-        new PurgeAction().getPurgeCommand(toPurge).executeCommand();
+        new PurgeAction(false).getPurgeCommand(toPurge).executeCommand();
         // Combine adjacent countries into a single polygon
         Collection<Way> optimizedWays = new ArrayList<>();
@@ -110 +110 @@
         if (areas != null) {
             try {
-                JoinAreasResult result = new JoinAreasAction().joinAreas(areas);
+                JoinAreasResult result = new JoinAreasAction(false).joinAreas(areas);
                 if (result.hasChanges()) {
                     for (Multipolygon mp : result.getPolygons()) {