Changeset 13806 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-05-21T18:08:10+02:00 (6 years ago)

Author:

Don-vip

Message:

add IPrimitive.visitReferrers(PrimitiveVisitor)

Location:

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

Files:

• IPrimitive.java (modified) (1 diff)
• OsmPrimitive.java (modified) (5 diffs)
• PrimitiveData.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java

@@ -308 +308 @@
 
     /**
+     * <p>Visits {@code visitor} for all referrers.</p>
+     *
+     * @param visitor the visitor. Ignored, if null.
+     * @since 13806
+     */
+    void visitReferrers(PrimitiveVisitor visitor);
+
+    /**
      * Replies the name of this primitive. The default implementation replies the value
      * of the tag <code>name</code> or null, if this tag is not present.

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -19 +19 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -24 +25 @@
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -998 +1000 @@
      */
     public void visitReferrers(OsmPrimitiveVisitor visitor) {
-        if (visitor == null) return;
+        if (visitor != null)
+            doVisitReferrers(o -> o.accept(visitor));
+    }
+
+    @Override
+    public void visitReferrers(PrimitiveVisitor visitor) {
+        if (visitor != null)
+            doVisitReferrers(o -> o.accept(visitor));
+    }
+
+    private void doVisitReferrers(Consumer<OsmPrimitive> visitor) {
         if (this.referrers == null)
             return;
@@ -1004 +1016 @@
             OsmPrimitive ref = (OsmPrimitive) this.referrers;
             if (ref.dataSet == dataSet) {
-                ref.accept(visitor);
+                visitor.accept(ref);
             }
         } else if (this.referrers instanceof OsmPrimitive[]) {
@@ -1010 +1022 @@
             for (OsmPrimitive ref: refs) {
                 if (ref.dataSet == dataSet) {
-                    ref.accept(visitor);
+                    visitor.accept(ref);
                 }
             }

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -13 +13 @@
 import java.util.Map;
 
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
 
@@ -170 +171 @@
 
     @Override
+    public void visitReferrers(PrimitiveVisitor visitor) {
+        // Override if needed
+    }
+
+    @Override
     public StyleCache getCachedStyle() {
         return null;