- Timestamp:
- 2018-05-21T18:08:10+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java
r13764 r13806 308 308 309 309 /** 310 * <p>Visits {@code visitor} for all referrers.</p> 311 * 312 * @param visitor the visitor. Ignored, if null. 313 * @since 13806 314 */ 315 void visitReferrers(PrimitiveVisitor visitor); 316 317 /** 310 318 * Replies the name of this primitive. The default implementation replies the value 311 319 * of the tag <code>name</code> or null, if this tag is not present. -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r13764 r13806 19 19 import java.util.Objects; 20 20 import java.util.Set; 21 import java.util.function.Consumer; 21 22 22 23 import org.openstreetmap.josm.data.osm.search.SearchCompiler; … … 24 25 import org.openstreetmap.josm.data.osm.search.SearchParseError; 25 26 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor; 27 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor; 26 28 import org.openstreetmap.josm.gui.mappaint.StyleCache; 27 29 import org.openstreetmap.josm.spi.preferences.Config; … … 998 1000 */ 999 1001 public void visitReferrers(OsmPrimitiveVisitor visitor) { 1000 if (visitor == null) return; 1002 if (visitor != null) 1003 doVisitReferrers(o -> o.accept(visitor)); 1004 } 1005 1006 @Override 1007 public void visitReferrers(PrimitiveVisitor visitor) { 1008 if (visitor != null) 1009 doVisitReferrers(o -> o.accept(visitor)); 1010 } 1011 1012 private void doVisitReferrers(Consumer<OsmPrimitive> visitor) { 1001 1013 if (this.referrers == null) 1002 1014 return; … … 1004 1016 OsmPrimitive ref = (OsmPrimitive) this.referrers; 1005 1017 if (ref.dataSet == dataSet) { 1006 ref.accept(visitor);1018 visitor.accept(ref); 1007 1019 } 1008 1020 } else if (this.referrers instanceof OsmPrimitive[]) { … … 1010 1022 for (OsmPrimitive ref: refs) { 1011 1023 if (ref.dataSet == dataSet) { 1012 ref.accept(visitor);1024 visitor.accept(ref); 1013 1025 } 1014 1026 } -
trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
r13764 r13806 13 13 import java.util.Map; 14 14 15 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor; 15 16 import org.openstreetmap.josm.gui.mappaint.StyleCache; 16 17 … … 170 171 171 172 @Override 173 public void visitReferrers(PrimitiveVisitor visitor) { 174 // Override if needed 175 } 176 177 @Override 172 178 public StyleCache getCachedStyle() { 173 179 return null;
Note:
See TracChangeset
for help on using the changeset viewer.