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

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/gui

Files:

• dialogs/ConflictDialog.java (modified) (3 diffs)
• history/HistoryBrowserModel.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (2 diffs)
• mappaint/mapcss/Selector.java (modified) (4 diffs)

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

@@ -51 +51 @@
 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.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -253 +252 @@
             return;
         g.setColor(preferencesColor);
-        Visitor conflictPainter = new ConflictPainter(nc, g);
+        OsmPrimitiveVisitor conflictPainter = new ConflictPainter(nc, g);
         synchronized (this) {
             for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
@@ -542 +541 @@
      * Paints conflicts.
      */
-    public static class ConflictPainter extends AbstractVisitor {
+    public static class ConflictPainter implements OsmPrimitiveVisitor {
         // Manage a stack of visited relations to avoid infinite recursion with cyclic relations (fix #7938)
         private final Set<Relation> visited = new HashSet<>();

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.history.HistoryRelation;
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -645 +645 @@
      *
      */
-    static class HistoryPrimitiveBuilder extends AbstractVisitor {
+    static class HistoryPrimitiveBuilder implements OsmPrimitiveVisitor {
         private HistoryOsmPrimitive clone;
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -76 +76 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
@@ -243 +243 @@
      * A listener that counts the number of primitives it encounters
      */
-    public static final class DataCountVisitor extends AbstractVisitor {
+    public static final class DataCountVisitor implements OsmPrimitiveVisitor {
         /**
          * Nodes that have been visited

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) {