Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 10758)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 10759)
@@ -211,9 +211,4 @@
 
     /**
-     * The data validation handler.
-     */
-    public OsmValidator validator;
-
-    /**
      * The file watcher service.
      */
@@ -641,5 +636,5 @@
             @Override
             public void initialize() {
-                validator = new OsmValidator();
+                OsmValidator.initialize();
             }
         });
Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 10758)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 10759)
@@ -70,10 +70,14 @@
  * @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,7 +154,7 @@
 
     /**
-     * Constructs a new {@code OsmValidator}.
-     */
-    public OsmValidator() {
+     * Initializes {@code OsmValidator}.
+     */
+    public static void initialize() {
         checkValidatorDir();
         initializeGridDetail();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 10758)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 10759)
@@ -135,5 +135,5 @@
         buttons.add(lookupButton);
 
-        buttons.add(new SideButton(Main.main.validator.validateAction));
+        buttons.add(new SideButton(OsmValidator.validateAction));
 
         fixButton = new SideButton(new AbstractAction() {