Index: /applications/editors/josm/plugins/validator/ignoretags.cfg
===================================================================
--- /applications/editors/josm/plugins/validator/ignoretags.cfg	(revision 18736)
+++ /applications/editors/josm/plugins/validator/ignoretags.cfg	(revision 18737)
@@ -249,11 +249,11 @@
 T:religion=christian|denomination=greek_orthodox
 T:religion=jewish|denomination=hasidic
-T:religion=jewish|denomination=humanistic  
+T:religion=jewish|denomination=humanistic
 T:religion=muslim|denomination=ibadi
 T:religion=muslim|denomination=ismaili
 T:religion=christian|denomination=jehovahs_witness
 T:religion=christian|denomination=kabbalah
-T:religion=christian|denomination=karaite  
-T:religion=jewish|denomination=liberal  
+T:religion=christian|denomination=karaite
+T:religion=jewish|denomination=liberal
 T:religion=christian|denomination=living_waters_church
 T:religion=christian|denomination=lutheran
@@ -270,14 +270,14 @@
 T:religion=muslim|denomination=nondenominational
 T:religion=christian|denomination=old_catholic
-T:religion=christian|denomination=orthodox 
-T:religion=jewish|denomination=orthodox 
+T:religion=christian|denomination=orthodox
+T:religion=jewish|denomination=orthodox
 T:religion=christian|denomination=pentecostal
 T:religion=christian|denomination=presbyterian
-T:religion=jewish|denomination=progressive 
+T:religion=jewish|denomination=progressive
 T:religion=christian|denomination=protestant
 T:religion=christian|denomination=quaker
 T:religion=jewish|denomination=reconstructionist
 T:religion=jewish|denomination=reform
-T:religion=jewish|denomination=renewal   
+T:religion=jewish|denomination=renewal
 T:religion=christian|denomination=roman_catholic
 T:religion=christian|denomination=russian_orthodox
@@ -286,5 +286,5 @@
 T:religion=christian|denomination=seventh_day_adventist
 T:religion=muslim|denomination=shia
-T:religion=muslim|denomination=sunni  
+T:religion=muslim|denomination=sunni
 T:religion=jewish|denomination=ultra_orthodox
 T:religion=christian|denomination=united
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 18736)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java	(revision 18737)
@@ -143,5 +143,5 @@
 
         Set<DefaultMutableTreeNode> processedNodes = new HashSet<DefaultMutableTreeNode>();
-               
+
         DuplicateNode.clearBackreferences();
         LinkedList<TestError> errorsToFix = new LinkedList<TestError>();
@@ -160,9 +160,9 @@
                 Object nodeInfo = childNode.getUserObject();
                 if (nodeInfo instanceof TestError) {
-                	errorsToFix.add((TestError)nodeInfo);
-                }
-            }
-        }
-        
+                    errorsToFix.add((TestError)nodeInfo);
+                }
+            }
+        }
+
         // run fix task asynchronously
         //
@@ -445,77 +445,77 @@
         tree.setFilter(filter);
     }
-    
-    /**
-     * Task for fixing a collection of {@see TestError}s. Can be run asynchronously. 
-     * 
+
+    /**
+     * Task for fixing a collection of {@see TestError}s. Can be run asynchronously.
      *
+     *
      */
     class FixTask extends PleaseWaitRunnable {
-    	private Collection<TestError> testErrors;
-    	private boolean canceled;
-    	private LinkedList<Command> fixCommands;
-    
-    	
-    	public FixTask(Collection<TestError> testErrors) {
-    		super(tr("Fixing errors ..."), false /* don't ignore exceptions */);
-    		this.testErrors = testErrors == null ? new ArrayList<TestError> (): testErrors;
-    		fixCommands = new LinkedList<Command>();
-    	}
-
-		@Override
-		protected void cancel() {
-			this.canceled = true; 			
-		}
-
-		@Override
-		protected void finish() {
-			// do nothing
-		}
- 		
-		@Override
-		protected void realRun() throws SAXException, IOException,
-				OsmTransferException {
-			ProgressMonitor monitor = getProgressMonitor();
-			try {				
-				monitor.setTicksCount(testErrors.size());
-				int i=0;
-				for (TestError error: testErrors) {
-					i++;
-					monitor.subTask(tr("Fixing ({0}/{1}): ''{2}''", i, testErrors.size(),error.getMessage()));
-					if (this.canceled) 
-						return;
-					final Command fixCommand = error.getFix();
+        private Collection<TestError> testErrors;
+        private boolean canceled;
+        private LinkedList<Command> fixCommands;
+
+
+        public FixTask(Collection<TestError> testErrors) {
+            super(tr("Fixing errors ..."), false /* don't ignore exceptions */);
+            this.testErrors = testErrors == null ? new ArrayList<TestError> (): testErrors;
+            fixCommands = new LinkedList<Command>();
+        }
+
+        @Override
+        protected void cancel() {
+            this.canceled = true;
+        }
+
+        @Override
+        protected void finish() {
+            // do nothing
+        }
+
+        @Override
+        protected void realRun() throws SAXException, IOException,
+                OsmTransferException {
+            ProgressMonitor monitor = getProgressMonitor();
+            try {
+                monitor.setTicksCount(testErrors.size());
+                int i=0;
+                for (TestError error: testErrors) {
+                    i++;
+                    monitor.subTask(tr("Fixing ({0}/{1}): ''{2}''", i, testErrors.size(),error.getMessage()));
+                    if (this.canceled)
+                        return;
+                    final Command fixCommand = error.getFix();
                     if (fixCommand != null) {
-                    	fixCommands.add(fixCommand);
-        				SwingUtilities.invokeAndWait(
-        						new Runnable() {
-        							public void run() {
-        								Main.main.undoRedo.addNoRedraw(fixCommand);
-        							}
-        						}
-        				);
+                        fixCommands.add(fixCommand);
+                        SwingUtilities.invokeAndWait(
+                                new Runnable() {
+                                    public void run() {
+                                        Main.main.undoRedo.addNoRedraw(fixCommand);
+                                    }
+                                }
+                        );
                         error.setIgnored(true);
                     }
                     monitor.worked(1);
-				}		
-				monitor.subTask(tr("Updating map ..."));
-				SwingUtilities.invokeAndWait(new Runnable() {
-					public void run() {
-						Main.main.undoRedo.afterAdd();
-						Main.map.repaint();
-						tree.resetErrors();
-			            Main.main.getCurrentDataSet().fireSelectionChanged();
-					}
-				});
-			} catch(InterruptedException e) { 
-				// FIXME: signature of realRun should have a generic checked exception we
-				// could throw here
-				throw new RuntimeException(e);
-			} catch(InvocationTargetException e) {
-				throw new RuntimeException(e);
-			} finally {
-				monitor.finishTask();
-			}			
-		}
+                }
+                monitor.subTask(tr("Updating map ..."));
+                SwingUtilities.invokeAndWait(new Runnable() {
+                    public void run() {
+                        Main.main.undoRedo.afterAdd();
+                        Main.map.repaint();
+                        tree.resetErrors();
+                        Main.main.getCurrentDataSet().fireSelectionChanged();
+                    }
+                });
+            } catch(InterruptedException e) {
+                // FIXME: signature of realRun should have a generic checked exception we
+                // could throw here
+                throw new RuntimeException(e);
+            } catch(InvocationTargetException e) {
+                throw new RuntimeException(e);
+            } finally {
+                monitor.finishTask();
+            }
+        }
     }
 }
Index: /applications/editors/josm/plugins/validator/tagchecker.cfg
===================================================================
--- /applications/editors/josm/plugins/validator/tagchecker.cfg	(revision 18736)
+++ /applications/editors/josm/plugins/validator/tagchecker.cfg	(revision 18737)
@@ -75,5 +75,5 @@
 node : I : amenity == /restaurant|cafe|fast_food/ && name != * # restaurant without name
 #way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
-*    : W : natural == water && waterway == *                   # unusual tag combination
+#*    : W : natural == water && waterway == *                   # unusual tag combination
 *    : W : highway == * && waterway == *                       # unusual tag combination
 *    : W : highway == * && natural == *                        # unusual tag combination