Changeset 12809 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -143 +143 @@
          *
          */
-        private class MatchingReferrerFinder extends AbstractVisitor {
+        private class MatchingReferrerFinder implements OsmPrimitiveVisitor {
             private final Environment e;
 
@@ -195 +195 @@
         }
 
-        private abstract static class AbstractFinder extends AbstractVisitor {
+        private abstract static class AbstractFinder implements OsmPrimitiveVisitor {
             protected final Environment e;
 
@@ -241 +241 @@
             }
 
-            private final AbstractVisitor innerVisitor = new AbstractFinder(e) {
+            private final OsmPrimitiveVisitor innerVisitor = new AbstractFinder(e) {
                 @Override
                 public void visit(Relation r) {