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

Timestamp:

2012-10-02T20:54:42+02:00 (12 years ago)

Author:

jttt

Message:

Fix #8045 New "Registered toolbar action" bug with the Validator.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (1 diff)
• actions/ValidateAction.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

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

@@ -100 +100 @@
      *            won't be assigned a shortcut unless the user configures one. If you pass null here,
      *            the user CANNOT configure a shortcut for your action.
-     * @param register register this action for the toolbar preferences?
+     * @param registerInToolbar register this action for the toolbar preferences?
      * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
      */
-    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, String toolbarId, boolean installAdapters) {
-        this(name, iconName == null ? null : ImageProvider.get(iconName), tooltip, shortcut, register,
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
+        this(name, iconName == null ? null : ImageProvider.get(iconName), tooltip, shortcut, registerInToolbar,
                 toolbarId == null ? iconName : toolbarId, installAdapters);
     }
 
-    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, boolean installAdapters) {
-        this(name, iconName, tooltip, shortcut, register, null, installAdapters);
-    }
-
-    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
-        this(name, iconName, tooltip, shortcut, register, null, true);
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, boolean installAdapters) {
+        this(name, iconName, tooltip, shortcut, registerInToolbar, null, installAdapters);
+    }
+
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
+        this(name, iconName, tooltip, shortcut, registerInToolbar, null, true);
     }
 

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

@@ -101 +101 @@
     }
 
+    @Override
+    public void destroy() {
+        // Hack - this action should stay forever because it could be added to toolbar
+        // Do not call super.destroy() here
+    }
+
     /**
      * Asynchronous task for running a collection of tests against a collection

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.data.projection.Epsg4326;
 import org.openstreetmap.josm.data.projection.Lambert;
@@ -67 +68 @@
     public static ValidatorLayer errorLayer = null;
 
+    /** The validate action */
+    public ValidateAction validateAction = new ValidateAction();
+
     /** Grid detail, multiplier of east,north values for valuable cell sizing */
     public static double griddetail;

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -33 +33 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -130 +129 @@
         buttons.add(selectButton);
 
-        buttons.add(new SideButton(new ValidateAction()));
+        buttons.add(new SideButton(Main.main.validator.validateAction));
 
         fixButton = new SideButton(new AbstractAction() {