Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 6009)
@@ -235,5 +235,5 @@
             }
             for (OsmPrimitive osm : sel) {
-                osm.visit(v);
+                osm.accept(v);
             }
             // increase bbox by 0.001 degrees on each side. this is required
Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 6009)
@@ -204,5 +204,5 @@
                     // we upload modified nodes even if they aren't in the current
                     // selection.
-                    n.visit(this);
+                    n.accept(this);
                 }
             }
@@ -218,5 +218,5 @@
                     //
                     if (p.isNewOrUndeleted()) {
-                        p.visit(this);
+                        p.accept(this);
                     }
                 }
@@ -240,5 +240,5 @@
             hull = new HashSet<OsmPrimitive>();
             for (OsmPrimitive p: base) {
-                p.visit(this);
+                p.accept(this);
             }
             return hull;
Index: /trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java	(revision 6009)
@@ -72,5 +72,5 @@
         if (objects.size() == 1) {
             NameVisitor v = new NameVisitor();
-            objects.iterator().next().visit(v);
+            objects.iterator().next().accept(v);
             text += " "+tr(v.className)+" "+v.name;
         } else {
@@ -93,5 +93,5 @@
         final NameVisitor v = new NameVisitor();
         for (final OsmPrimitive osm : objects) {
-            osm.visit(v);
+            osm.accept(v);
             children.add(new PseudoCommand() {
                 @Override
Index: /trunk/src/org/openstreetmap/josm/command/Command.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/Command.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/command/Command.java	(revision 6009)
@@ -86,5 +86,5 @@
         fillModifiedData(all, all, all);
         for (OsmPrimitive osm : all) {
-            osm.visit(visitor);
+            osm.accept(visitor);
         }
         cloneMap = visitor.orig;
Index: /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java	(revision 6009)
@@ -31,5 +31,5 @@
     void setChangesetId(int changesetId);
 
-    void visit(PrimitiveVisitor visitor);
+    void accept(PrimitiveVisitor visitor);
     String getName();
     String getLocalName();
Index: /trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 6009)
@@ -196,10 +196,10 @@
 
     @Override
-    public void visit(Visitor visitor) {
+    public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
     @Override
-    public void visit(PrimitiveVisitor visitor) {
+    public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/NodeData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/NodeData.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/NodeData.java	(revision 6009)
@@ -73,5 +73,5 @@
 
     @Override
-    public void visit(PrimitiveVisitor visitor) {
+    public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 6009)
@@ -981,5 +981,5 @@
             OsmPrimitive ref = (OsmPrimitive) this.referrers;
             if (ref.dataSet == dataSet) {
-                ref.visit(visitor);
+                ref.accept(visitor);
             }
         } else if (this.referrers instanceof OsmPrimitive[]) {
@@ -987,5 +987,5 @@
             for (OsmPrimitive ref: refs) {
                 if (ref.dataSet == dataSet) {
-                    ref.visit(visitor);
+                    ref.accept(visitor);
                 }
             }
@@ -1027,5 +1027,5 @@
      * @param visitor The visitor from which the visit() function must be called.
      */
-    abstract public void visit(Visitor visitor);
+    abstract public void accept(Visitor visitor);
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java	(revision 6009)
@@ -69,5 +69,5 @@
                 firstIteration = false;
                 for (RelationMember m : r.getMembers()) {
-                    m.getMember().visit(this);
+                    m.getMember().accept(this);
                 }
             }
@@ -76,5 +76,5 @@
                 for (OsmPrimitive osm : primitives) {
                     firstIteration = true;
-                    osm.visit(this);
+                    osm.accept(this);
                 }
             }
Index: /trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 6009)
@@ -164,9 +164,9 @@
     }
 
-    @Override public void visit(Visitor visitor) {
+    @Override public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
-    @Override public void visit(PrimitiveVisitor visitor) {
+    @Override public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/RelationData.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/RelationData.java	(revision 6009)
@@ -64,5 +64,5 @@
 
     @Override
-    public void visit(PrimitiveVisitor visitor) {
+    public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 6009)
@@ -209,9 +209,9 @@
     }
 
-    @Override public void visit(Visitor visitor) {
+    @Override public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
-    @Override public void visit(PrimitiveVisitor visitor) {
+    @Override public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/osm/WayData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/WayData.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/osm/WayData.java	(revision 6009)
@@ -60,5 +60,5 @@
 
     @Override
-    public void visit(PrimitiveVisitor visitor) {
+    public void accept(PrimitiveVisitor visitor) {
         visitor.visit(this);
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java	(revision 6009)
@@ -122,5 +122,5 @@
     public void visit(OsmPrimitive p) {
         if (p.isUsable()) {
-            p.visit(this);
+            p.accept(this);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/Test.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/Test.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/data/validation/Test.java	(revision 6009)
@@ -142,5 +142,5 @@
         for (OsmPrimitive p : selection) {
             if (p.isUsable()) {
-                p.visit(this);
+                p.accept(this);
             }
             progressMonitor.worked(1);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 6009)
@@ -256,5 +256,5 @@
                     try {
                         for (RelationMember em : e.getMembers()) {
-                            em.getMember().visit(this);
+                            em.getMember().accept(this);
                         }
                     } finally {
@@ -268,5 +268,5 @@
                 continue;
             }
-            conflicts.getConflictForMy((OsmPrimitive)o).getTheir().visit(conflictPainter);
+            conflicts.getConflictForMy((OsmPrimitive)o).getTheir().accept(conflictPainter);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 6009)
@@ -520,5 +520,5 @@
         public void visit(OsmPrimitive p) {
             if (p.isUsable()) {
-                p.visit(this);
+                p.accept(this);
             }
         }
Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 6009)
@@ -806,5 +806,5 @@
 
         public HistoryOsmPrimitive build(OsmPrimitive primitive) {
-            primitive.visit(this);
+            primitive.accept(this);
             return clone;
         }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6009)
@@ -455,5 +455,5 @@
         final DataCountVisitor counter = new DataCountVisitor();
         for (final OsmPrimitive osm : data.allPrimitives()) {
-            osm.visit(counter);
+            osm.accept(counter);
         }
         final JPanel p = new JPanel(new GridBagLayout());
Index: /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java	(revision 6009)
@@ -99,5 +99,5 @@
         { // append primitive specific
             out.append("\t\"geometry\": {");
-            p.visit(this);
+            p.accept(this);
             out.append("}");
         }
Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 6009)
@@ -288,5 +288,5 @@
         osmWriter.setChangeset(changeset);
         osmWriter.header();
-        o.visit(osmWriter);
+        o.accept(osmWriter);
         osmWriter.footer();
         osmWriter.flush();
Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java	(revision 6008)
+++ /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java	(revision 6009)
@@ -43,9 +43,9 @@
             switchMode("delete");
             osmwriter.setWithBody(false);
-            p.visit(osmwriter);
+            p.accept(osmwriter);
         } else {
             switchMode(p.isNew() ? "create" : "modify");
             osmwriter.setWithBody(true);
-            p.visit(osmwriter);
+            p.accept(osmwriter);
         }
     }