Changeset 10759 in josm for trunk

Timestamp:

2016-08-07T17:47:01+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2440 - Classes with only "static" methods should not be instantiated

Location:

trunk/src/org/openstreetmap/josm

Files:

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

trunk/src/org/openstreetmap/josm/Main.java

@@ -211 +211 @@
 
     /**
-     * The data validation handler.
-     */
-    public OsmValidator validator;
-
-    /**
      * The file watcher service.
      */
@@ -641 +636 @@
             @Override
             public void initialize() {
-                validator = new OsmValidator();
+                OsmValidator.initialize();
             }
         });

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

@@ -70 +70 @@
  * @author Francisco R. Santos <frsantos@gmail.com>
  */
-public class OsmValidator {
+public final class OsmValidator {
+
+    private OsmValidator() {
+        // Hide default constructor for utilities classes
+    }
 
     public static volatile ValidatorLayer errorLayer;
 
     /** The validate action */
-    public ValidateAction validateAction = new ValidateAction();
+    public static final ValidateAction validateAction = new ValidateAction();
 
     /** Grid detail, multiplier of east,north values for valuable cell sizing */
@@ -150 +154 @@
 
     /**
-     * Constructs a new {@code OsmValidator}.
-     */
-    public OsmValidator() {
+     * Initializes {@code OsmValidator}.
+     */
+    public static void initialize() {
         checkValidatorDir();
         initializeGridDetail();

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

@@ -135 +135 @@
         buttons.add(lookupButton);
 
-        buttons.add(new SideButton(Main.main.validator.validateAction));
+        buttons.add(new SideButton(OsmValidator.validateAction));
 
         fixButton = new SideButton(new AbstractAction() {