Changeset 6389 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2008-01-14T19:59:57+01:00 (17 years ago)

Author:

gabriel

Message:

Validator plugin: Remove Util.getPlugin() hack.

Location:

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

Files:

• ErrorLayer.java (modified) (3 diffs)
• OSMValidatorPlugin.java (modified) (4 diffs)
• PreferenceEditor.java (modified) (3 diffs)
• ValidateAction.java (modified) (3 diffs)
• ValidatorDialog.java (modified) (4 diffs)
• util/Util.java (modified) (1 diff)

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

@@ -31 +31 @@
 public class ErrorLayer extends Layer implements LayerChangeListener
 {
-        /**
-         * Constructor 
-         * @param name
-         */
-        public ErrorLayer(String name) 
-    {
-                super(name);
+        private OSMValidatorPlugin plugin;
+
+        public ErrorLayer(OSMValidatorPlugin plugin) {
+                super(tr("Validation errors"));
+                this.plugin = plugin;
         Layer.listeners.add(this); 
         }
@@ -57 +55 @@
     public void paint(final Graphics g, final MapView mv) 
     {
-        DefaultMutableTreeNode root = OSMValidatorPlugin.getPlugin().validationDialog.tree.getRoot();
+        DefaultMutableTreeNode root = plugin.validationDialog.tree.getRoot();
         if( root == null || root.getChildCount() == 0)
             return;
@@ -85 +83 @@
     {
         Bag<Severity, TestError> errorTree = new Bag<Severity, TestError>();
-        List<TestError> errors = OSMValidatorPlugin.getPlugin().validationDialog.tree.getErrors();
+        List<TestError> errors = plugin.validationDialog.tree.getErrors();
         for(TestError e : errors)
         {

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

@@ -31 +31 @@
 {
     /** The validate action */
-    ValidateAction validateAction = new ValidateAction();
+    ValidateAction validateAction = new ValidateAction(this);
     
     /** The validation dialog */
@@ -70 +70 @@
         public PreferenceSetting getPreferenceSetting() 
         {
-                return new PreferenceEditor();
+                return new PreferenceEditor(this);
         }
         
@@ -78 +78 @@
                 if (newFrame != null)
                 {
-                    validationDialog = new ValidatorDialog();
+                    validationDialog = new ValidatorDialog(this);
                 newFrame.addToggleDialog(validationDialog);
-            Main.main.addLayer(new ErrorLayer(tr("Validation errors")));
+            Main.main.addLayer(new ErrorLayer(this));
                 if( Main.pref.hasKey(PreferenceEditor.PREF_DEBUG + ".grid") )
                         Main.main.addLayer(new GridLayer(tr("Grid")));
@@ -101 +101 @@
                 if( newFrame != null )
                         hooks.add( 0, new ValidateUploadHook() );
-        }
-
-        
-        /**
-         * Utility method for classes that can't access the plugin directly
-         * 
-         * @return The plugin object
-         */
-        public static OSMValidatorPlugin getPlugin() 
-        {
-                return (OSMValidatorPlugin)Util.getPlugin(OSMValidatorPlugin.class);
         }
 

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

@@ -24 +24 @@
 public class PreferenceEditor implements PreferenceSetting
 {
+        private OSMValidatorPlugin plugin;
+
         /** The preferences prefix */
         public static final String PREFIX = "validator";
@@ -38 +40 @@
         /** The list of all tests */
         private Collection<Test> allTests;
+
+        public PreferenceEditor(OSMValidatorPlugin plugin) {
+                this.plugin = plugin;
+        }
 
     public void addGui(PreferenceDialog gui)
@@ -81 +87 @@
                 if (testsBeforeUpload.length() > 0 ) testsBeforeUpload = testsBeforeUpload.deleteCharAt(0);
                 
-                OSMValidatorPlugin.getPlugin().initializeTests( allTests );
+                plugin.initializeTests( allTests );
                 
                 Main.pref.put( PREF_TESTS, tests.toString());

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

@@ -23 +23 @@
 public class ValidateAction extends JosmAction 
 {
+        private OSMValidatorPlugin plugin;
+
         /** Serializable ID */
     private static final long serialVersionUID = -2304521273582574603L;
@@ -32 +34 @@
          * Constructor
          */
-        public ValidateAction()
-        {
+        public ValidateAction(OSMValidatorPlugin plugin) {
                 super("Validation", "validator", "Performs the data validation", KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK + KeyEvent.ALT_MASK, true);
+                this.plugin = plugin;
         }
 
@@ -54 +56 @@
         public void doValidate(@SuppressWarnings("unused") ActionEvent ev, boolean getSelectedItems)
         {
-                OSMValidatorPlugin plugin = OSMValidatorPlugin.getPlugin();
         if( plugin.validateAction == null || Main.map == null || !Main.map.isVisible() )
             return;

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

@@ -32 +32 @@
 public class ValidatorDialog extends ToggleDialog implements ActionListener
 {
+        private OSMValidatorPlugin plugin;
+
     /** Serializable ID */
     private static final long serialVersionUID = 2952292777351992696L;
@@ -56 +58 @@
      * Constructor
      */
-    public ValidatorDialog() 
-    {
+    public ValidatorDialog(OSMValidatorPlugin plugin) {
         super(tr("Validation errors"), "validator", tr("Open the validation window."), KeyEvent.VK_V, 150);
+
+                this.plugin = plugin;
         
         tree = new ErrorTreePanel();
@@ -134 +137 @@
                 DataSet.fireSelectionChanged(Main.ds.getSelected());
                        
-        OSMValidatorPlugin.getPlugin().validateAction.doValidate(e, false);
+        plugin.validateAction.doValidate(e, false);
         }       
         
@@ -177 +180 @@
                         setSelectedItems();
                 else if( actionCommand.equals("Validate"))
-                OSMValidatorPlugin.getPlugin().validateAction.actionPerformed(e);
+                plugin.validateAction.actionPerformed(e);
                 else if( actionCommand.equals("Fix"))
                 fixErrors(e); 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java

@@ -26 +26 @@
 public class Util 
 {
-
-    /**
-     * Utility method to retrieve the plugin for classes that can't access to the plugin object directly.
-     * 
-     * @param clazz The plugin class
-     * @return The YWMS plugin
-     */
-    public static Plugin getPlugin(Class<? extends Plugin> clazz)
-    {
-        String classname = clazz.getName();
-        for (PluginProxy plugin : Main.plugins)
-        {
-            if( plugin.info.className.equals(classname) )
-            {
-                return (Plugin)plugin.plugin;
-            }
-        }
-        
-        return null;
-    }
-    
         /** 
          * Returns the plugin's directory of the plugin