Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java	(revision 4074)
+++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java	(revision 4075)
@@ -18,5 +18,5 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.data.validation.util.AgregatePrimitivesVisitor;
+import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
@@ -80,5 +80,5 @@
                 lastSelection = null;
             } else {
-                AgregatePrimitivesVisitor v = new AgregatePrimitivesVisitor();
+                AggregatePrimitivesVisitor v = new AggregatePrimitivesVisitor();
                 selection = v.visit(selection);
                 lastSelection = selection;
Index: /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 4074)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java	(revision 4075)
@@ -20,5 +20,5 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.data.validation.util.AgregatePrimitivesVisitor;
+import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
@@ -49,5 +49,5 @@
             return true;
 
-        AgregatePrimitivesVisitor v = new AgregatePrimitivesVisitor();
+        AggregatePrimitivesVisitor v = new AggregatePrimitivesVisitor();
         v.visit(apiDataSet.getPrimitivesToAdd());
         Collection<OsmPrimitive> selection = v.visit(apiDataSet.getPrimitivesToUpdate());
Index: /trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java	(revision 4075)
+++ /trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java	(revision 4075)
@@ -0,0 +1,64 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation.util;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+
+/**
+ * A visitor that aggregates all primitives it visits.
+ * <p>
+ * The primitives are sorted according to their type: first nodes, then ways.
+ *
+ * @author frsantos
+ */
+public class AggregatePrimitivesVisitor extends AbstractVisitor {
+    /** Aggregated data */
+    final Collection<OsmPrimitive> aggregatedData = new HashSet<OsmPrimitive>();
+
+    /**
+     * Visits a collection of primitives
+     * @param data The collection of primitives
+     * @return The aggregated primitives
+     */
+    public Collection<OsmPrimitive> visit(Collection<OsmPrimitive> data) {
+        for (OsmPrimitive osm : data) {
+            osm.visit(this);
+        }
+
+        return aggregatedData;
+    }
+
+    @Override
+    public void visit(Node n) {
+        if (!aggregatedData.contains(n)) {
+            aggregatedData.add(n);
+        }
+    }
+
+    @Override
+    public void visit(Way w) {
+        if (!aggregatedData.contains(w)) {
+            aggregatedData.add(w);
+            for (Node n : w.getNodes()) {
+                visit(n);
+            }
+        }
+    }
+
+    @Override
+    public void visit(Relation r) {
+        if (!aggregatedData.contains(r)) {
+            aggregatedData.add(r);
+            for (RelationMember m : r.getMembers()) {
+                m.getMember().visit(this);
+            }
+        }
+    }
+}
Index: unk/src/org/openstreetmap/josm/data/validation/util/AgregatePrimitivesVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/util/AgregatePrimitivesVisitor.java	(revision 4074)
+++ 	(revision )
@@ -1,64 +1,0 @@
-// License: GPL. See LICENSE file for details.
-package org.openstreetmap.josm.data.validation.util;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
-
-/**
- * A visitor that aggregates all primitives it visits.
- * <p>
- * The primitives are sorted according to their type: first nodes, then ways.
- *
- * @author frsantos
- */
-public class AgregatePrimitivesVisitor extends AbstractVisitor {
-    /** Aggregated data */
-    final Collection<OsmPrimitive> aggregatedData = new HashSet<OsmPrimitive>();
-
-    /**
-     * Visits a collection of primitives
-     * @param data The collection of primitives
-     * @return The aggregated primitives
-     */
-    public Collection<OsmPrimitive> visit(Collection<OsmPrimitive> data) {
-        for (OsmPrimitive osm : data) {
-            osm.visit(this);
-        }
-
-        return aggregatedData;
-    }
-
-    @Override
-    public void visit(Node n) {
-        if (!aggregatedData.contains(n)) {
-            aggregatedData.add(n);
-        }
-    }
-
-    @Override
-    public void visit(Way w) {
-        if (!aggregatedData.contains(w)) {
-            aggregatedData.add(w);
-            for (Node n : w.getNodes()) {
-                visit(n);
-            }
-        }
-    }
-
-    @Override
-    public void visit(Relation r) {
-        if (!aggregatedData.contains(r)) {
-            aggregatedData.add(r);
-            for (RelationMember m : r.getMembers()) {
-                m.getMember().visit(this);
-            }
-        }
-    }
-}