Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 19503)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 19505)
@@ -10,5 +10,4 @@
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62,6 +61,4 @@
 public class OSMValidatorPlugin extends Plugin implements LayerChangeListener {
 
-    protected static OSMValidatorPlugin plugin;
-
     protected static ErrorLayer errorLayer = null;
 
@@ -109,5 +106,4 @@
     public OSMValidatorPlugin(PluginInformation info) {
     	super(info);
-        plugin = this;
         checkPluginDir();
         initializeGridDetail();
@@ -273,14 +269,6 @@
             try {
                 if (test.enabled) {
-                    test.getClass().getMethod("initialize", new Class[] { OSMValidatorPlugin.class }).invoke(null,
-                            new Object[] { this });
+                    test.initialize(this);
                 }
-            } catch (InvocationTargetException ite) {
-                ite.getCause().printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent,
-                		tr("Error initializing test {0}:\n {1}", test.getClass()
-                        .getSimpleName(), ite.getCause().getMessage()),
-                        tr("Error"),
-                        JOptionPane.ERROR_MESSAGE);
             } catch (Exception e) {
                 e.printStackTrace();
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 19503)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 19505)
@@ -86,5 +86,5 @@
      * @throws Exception When cannot initialize the test
      */
-    public static void initialize(OSMValidatorPlugin plugin) throws Exception {}
+    public void initialize(OSMValidatorPlugin plugin) throws Exception {}
 
     /**
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java	(revision 19503)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java	(revision 19505)
@@ -14,5 +14,4 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -66,5 +65,5 @@
             return;
 
-        OSMValidatorPlugin.plugin.initializeErrorLayer();
+        plugin.initializeErrorLayer();
 
         Collection<Test> tests = OSMValidatorPlugin.getEnabledTests(false);
@@ -91,5 +90,5 @@
 
         ValidationTask task = new ValidationTask(tests, selection, lastSelection);
-        Main.worker.submit(task);        
+        Main.worker.submit(task);
     }
 
@@ -98,11 +97,11 @@
         setEnabled(getEditLayer() != null);
     }
-    
+
     /**
      * Asynchronous task for running a collection of tests against a collection
-     * of primitives 
+     * of primitives
      *
      */
-    
+
     class ValidationTask extends PleaseWaitRunnable {
     	private Collection<Test> tests;
@@ -111,9 +110,9 @@
     	private boolean canceled;
         private List<TestError> errors;
-        
+
         /**
-         * 
-         * @param tests  the tests to run 
-         * @param validatedPrimitives the collection of primitives to validate. 
+         *
+         * @param tests  the tests to run
+         * @param validatedPrimitives the collection of primitives to validate.
          * @param formerValidatedPrimitives the last collection of primitives being validates. May be null.
          */
@@ -124,8 +123,8 @@
     		this.tests = tests;
     	}
-    	
+
 		@Override
 		protected void cancel() {
-			this.canceled = true; 			
+			this.canceled = true;
 		}
 
@@ -133,5 +132,5 @@
 		protected void finish() {
 			if (canceled) return;
-			
+
 			// update GUI on Swing EDT
 			//
@@ -141,8 +140,8 @@
 			        plugin.validationDialog.setVisible(true);
 			        Main.main.getCurrentDataSet().fireSelectionChanged();
-				}				
+				}
 			};
 			if (SwingUtilities.isEventDispatchThread()) {
-				r.run();				
+				r.run();
 			} else {
 				SwingUtilities.invokeLater(r);
@@ -153,9 +152,9 @@
 		protected void realRun() throws SAXException, IOException,
 				OsmTransferException {
-			if (tests == null || tests.isEmpty()) return;		
+			if (tests == null || tests.isEmpty()) return;
 	        errors = new ArrayList<TestError>(200);
 	        getProgressMonitor().setTicksCount(tests.size() * validatedPrimitmives.size());
 	        int testCounter = 0;
-			for (Test test : tests) {				
+			for (Test test : tests) {
 				if (canceled) return;
 				testCounter++;
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java	(revision 19503)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java	(revision 19505)
@@ -76,9 +76,9 @@
     /** The TagChecker data */
     protected static List<CheckerData> checkerData = new ArrayList<CheckerData>();
-    protected static ArrayList<String> ignoreDataStartsWith = new ArrayList<String>();
-    protected static ArrayList<String> ignoreDataEquals = new ArrayList<String>();
-    protected static ArrayList<String> ignoreDataEndsWith = new ArrayList<String>();
-    protected static ArrayList<IgnoreKeyPair> ignoreDataKeyPair = new ArrayList<IgnoreKeyPair>();
-    protected static ArrayList<IgnoreTwoKeyPair> ignoreDataTwoKeyPair = new ArrayList<IgnoreTwoKeyPair>();
+    protected static List<String> ignoreDataStartsWith = new ArrayList<String>();
+    protected static List<String> ignoreDataEquals = new ArrayList<String>();
+    protected static List<String> ignoreDataEndsWith = new ArrayList<String>();
+    protected static List<IgnoreKeyPair> ignoreDataKeyPair = new ArrayList<IgnoreKeyPair>();
+    protected static List<IgnoreTwoKeyPair> ignoreDataTwoKeyPair = new ArrayList<IgnoreTwoKeyPair>();
 
     /** The preferences prefix */
@@ -152,5 +152,6 @@
     }
 
-    public static void initialize(OSMValidatorPlugin plugin) throws Exception
+    @Override
+    public void initialize(OSMValidatorPlugin plugin) throws Exception
     {
         initializeData();