Index: /applications/editors/josm/plugins/validator/.classpath
===================================================================
--- /applications/editors/josm/plugins/validator/.classpath	(revision 16680)
+++ /applications/editors/josm/plugins/validator/.classpath	(revision 16681)
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/josm"/>
+	<classpathentry including="images/" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
Index: /applications/editors/josm/plugins/validator/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/validator/.settings/org.eclipse.jdt.core.prefs	(revision 16680)
+++ /applications/editors/josm/plugins/validator/.settings/org.eclipse.jdt.core.prefs	(revision 16681)
@@ -1,3 +1,3 @@
-#Sun Sep 07 16:57:55 CEST 2008
+#Fri Jun 26 21:35:48 CEST 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
Index: /applications/editors/josm/plugins/validator/josm-validator.launch
===================================================================
--- /applications/editors/josm/plugins/validator/josm-validator.launch	(revision 16681)
+++ /applications/editors/josm/plugins/validator/josm-validator.launch	(revision 16681)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="validator"/>
+</launchConfiguration>
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 16680)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 16681)
@@ -72,5 +72,5 @@
     /** 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,5 +122,5 @@
         }
     }
-    
+
     private void loadIgnoredErrors() {
         ignoredErrors.clear();
@@ -250,5 +250,5 @@
     /**
      * 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,5 +261,5 @@
             OSMValidatorPlugin.griddetail = 0.1;
     }
-    
+
     /**
      * Initializes all tests
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 16680)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java	(revision 16681)
@@ -111,3 +111,8 @@
         DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
     }
+
+    @Override
+    public void updateEnabledState() {
+        setEnabled(getEditLayer() != null);
+    }
 }
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java	(revision 16680)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java	(revision 16681)
@@ -98,6 +98,5 @@
         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,6 +301,4 @@
         if (actionCommand.equals("Select"))
             setSelectedItems();
-        else if (actionCommand.equals("Validate"))
-            plugin.validateAction.actionPerformed(e);
         else if (actionCommand.equals("Fix"))
             fixErrors(e);