Changeset 19505 in osm for applications/editors

Timestamp:

2010-01-13T21:33:51+01:00 (15 years ago)

Author:

jttt

Message:

Cleanup test initialization

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• OSMValidatorPlugin.java (modified) (4 diffs)
• Test.java (modified) (1 diff)
• ValidateAction.java (modified) (9 diffs)
• tests/TagChecker.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62 +61 @@
 public class OSMValidatorPlugin extends Plugin implements LayerChangeListener {
 
-    protected static OSMValidatorPlugin plugin;
-
     protected static ErrorLayer errorLayer = null;
 
@@ -109 +106 @@
     public OSMValidatorPlugin(PluginInformation info) {
         super(info);
-        plugin = this;
         checkPluginDir();
         initializeGridDetail();
@@ -273 +269 @@
             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();

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -86 +86 @@
      * @throws Exception When cannot initialize the test
      */
-    public static void initialize(OSMValidatorPlugin plugin) throws Exception {}
+    public void initialize(OSMValidatorPlugin plugin) throws Exception {}
 
     /**

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java

@@ -14 +14 @@
 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 +65 @@
             return;
 
-        OSMValidatorPlugin.plugin.initializeErrorLayer();
+        plugin.initializeErrorLayer();
 
         Collection<Test> tests = OSMValidatorPlugin.getEnabledTests(false);
@@ -91 +90 @@
 
         ValidationTask task = new ValidationTask(tests, selection, lastSelection);
-        Main.worker.submit(task);        
+        Main.worker.submit(task);
     }
 
@@ -98 +97 @@
         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 +110 @@
         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 +123 @@
                 this.tests = tests;
         }
-        
+
                 @Override
                 protected void cancel() {
-                        this.canceled = true;                   
+                        this.canceled = true;
                 }
 
@@ -133 +132 @@
                 protected void finish() {
                         if (canceled) return;
-                        
+
                         // update GUI on Swing EDT
                         //
@@ -141 +140 @@
                                 plugin.validationDialog.setVisible(true);
                                 Main.main.getCurrentDataSet().fireSelectionChanged();
-                                }                               
+                                }
                         };
                         if (SwingUtilities.isEventDispatchThread()) {
-                                r.run();                                
+                                r.run();
                         } else {
                                 SwingUtilities.invokeLater(r);
@@ -153 +152 @@
                 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++;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java

@@ -76 +76 @@
     /** 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 +152 @@
     }
 
-    public static void initialize(OSMValidatorPlugin plugin) throws Exception
+    @Override
+    public void initialize(OSMValidatorPlugin plugin) throws Exception
     {
         initializeData();