Changeset 13905 in josm for trunk

Timestamp:

2018-06-10T20:41:41+02:00 (6 years ago)

Author:

Don-vip

Message:

make BoundingXYVisitor implement PrimitiveVisitor

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (2 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (5 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -308 +309 @@
         }
         for (OsmPrimitive osm : sel) {
-            osm.accept(v);
+            osm.accept((PrimitiveVisitor) v);
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.INode;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IRelationMember;
+import org.openstreetmap.josm.data.osm.IWay;
 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.gui.MainApplication;
@@ -24 +27 @@
  * @author imi
  */
-public class BoundingXYVisitor implements OsmPrimitiveVisitor {
+public class BoundingXYVisitor implements OsmPrimitiveVisitor, PrimitiveVisitor {
 
     private ProjectionBounds bounds;
@@ -35 +38 @@
     @Override
     public void visit(Way w) {
+        visit((IWay<?>) w);
+    }
+
+    @Override
+    public void visit(Relation r) {
+        visit((IRelation<?>) r);
+    }
+
+    @Override
+    public void visit(INode n) {
+        visit((ILatLon) n);
+    }
+
+    @Override
+    public void visit(IWay<?> w) {
         if (w.isIncomplete()) return;
-        for (Node n : w.getNodes()) {
+        for (INode n : w.getNodes()) {
             visit(n);
         }
@@ -42 +60 @@
 
     @Override
-    public void visit(Relation e) {
+    public void visit(IRelation<?> r) {
         // only use direct members
-        for (RelationMember m : e.getMembers()) {
+        for (IRelationMember<?> m : r.getMembers()) {
             if (!m.isRelation()) {
                 m.getMember().accept(this);
@@ -226 +244 @@
                 continue;
             }
-            p.accept(this);
+            p.accept((PrimitiveVisitor) this);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -543 +544 @@
         public void visit(OsmPrimitive p) {
             if (p.isUsable()) {
-                p.accept(this);
+                p.accept((PrimitiveVisitor) this);
             }
         }