Changeset 16681 in osm for applications/editors/josm/plugins/validator/src/org

Timestamp:

2009-07-25T10:35:53+02:00 (15 years ago)

Author:

jttt

Message:

Enable validate action only when there is edit layer available

Location:

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

Files:

• OSMValidatorPlugin.java (modified) (4 diffs)
• ValidateAction.java (modified) (1 diff)
• ValidatorDialog.java (modified) (2 diffs)

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

@@ -72 +72 @@
     /** The list of errors per layer*/
     Map<Layer, List<TestError>> layerErrors = new HashMap<Layer, List<TestError>>();
-    
+
     /** Grid detail, multiplier of east,north values for valuable cell sizing */
     public static double griddetail;
@@ -122 +122 @@
         }
     }
-    
+
     private void loadIgnoredErrors() {
         ignoredErrors.clear();
@@ -250 +250 @@
     /**
      * Initialize grid details based on current projection system. Values based on
-     * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error 
+     * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error
      * until most bugs were discovered while keeping the processing time reasonable)
      */
@@ -261 +261 @@
             OSMValidatorPlugin.griddetail = 0.1;
     }
-    
+
     /**
      * Initializes all tests

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

@@ -111 +111 @@
         DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
     }
+
+    @Override
+    public void updateEnabledState() {
+        setEnabled(getEditLayer() != null);
+    }
 }

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

@@ -98 +98 @@
         selectButton.setEnabled(false);
         buttonPanel.add(selectButton);
-        buttonPanel.add(new SideButton(marktr("Validate"), "refresh", "Validator",
-                tr("Validate either current selection or complete dataset."), this));
+        buttonPanel.add(new SideButton(plugin.validateAction), "refresh");
         fixButton = new SideButton(marktr("Fix"), "fix", "Validator", tr("Fix the selected errors."), this);
         fixButton.setEnabled(false);
@@ -302 +301 @@
         if (actionCommand.equals("Select"))
             setSelectedItems();
-        else if (actionCommand.equals("Validate"))
-            plugin.validateAction.actionPerformed(e);
         else if (actionCommand.equals("Fix"))
             fixErrors(e);