Changeset 12809 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Timestamp:

2017-09-09T23:32:37+02:00 (7 years ago)

Author:

bastiK

Message:

replace abstract class AbstractVisitor by interface OsmPrimitiveVisitor; deprecate Visitor

• data.osm.visitor.Visitor awkwardly mixes OsmPrimitive types and Changeset class; this may have been used in the past, but is no longer needed; AbstractVisitor should have been a super-interface of Visitor in the first place
• hopefully, this is binary compatible and plugins can be updated gracefully

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• ComputeStyleListWorker.java (modified) (3 diffs)
• WireframeMapRenderer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -33 +33 @@
  * @since 11914 (extracted from StyledMapRenderer)
  */
-public class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
+public class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements OsmPrimitiveVisitor {
     private final transient List<? extends OsmPrimitive> input;
     private final transient List<StyleRecord> output;
@@ -128 +128 @@
     }
 
-    @Override
-    public void visit(Changeset cs) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Add new style records for the given node.

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
@@ -39 +38 @@
  * @since 23
  */
-public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor {
+public class WireframeMapRenderer extends AbstractMapRenderer implements OsmPrimitiveVisitor {
 
     /** Color Preference for ways not matching any other group */
@@ -388 +387 @@
     }
 
-    /**
-     * Visitor for changesets not used in this class
-     * @param cs The changeset for inspection.
-     */
-    @Override
-    public void visit(Changeset cs) {/* ignore */}
-
     @Override
     public void drawNode(Node n, Color color, int size, boolean fill) {