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

Timestamp:

2017-05-31T02:30:29+02:00 (8 years ago)

Author:

Don-vip

Message:

move Swing action to gui package (causes failure when running validator unit test as the GUI is not needed to be initialized)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (3 diffs)

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

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.data.validation.tests.Addresses;
 import org.openstreetmap.josm.data.validation.tests.ApiCapabilitiesTest;
@@ -76 +75 @@
 
     private static volatile ValidatorLayer errorLayer;
-
-    /** The validate action */
-    public static final ValidateAction validateAction = new ValidateAction();
 
     /** Grid detail, multiplier of east,north values for valuable cell sizing */

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

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.command.Command;
@@ -71 +72 @@
     public ValidatorTreePanel tree;
 
+    /** The validate action */
+    public static final ValidateAction validateAction = new ValidateAction();
+
     /** The fix button */
     private final SideButton fixButton;
@@ -134 +138 @@
         buttons.add(lookupButton);
 
-        buttons.add(new SideButton(OsmValidator.validateAction));
+        buttons.add(new SideButton(validateAction));
 
         fixButton = new SideButton(new AbstractAction() {