Changeset 13662 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement
- Timestamp:
- 2018-04-23T02:05:41+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
r13368 r13662 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.osm. OsmPrimitive;9 import org.openstreetmap.josm.data.osm.IPrimitive; 10 10 import org.openstreetmap.josm.data.osm.Relation; 11 11 import org.openstreetmap.josm.data.osm.Way; … … 120 120 121 121 @Override 122 public void paintPrimitive( OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter,122 public void paintPrimitive(IPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, 123 123 boolean selected, boolean outermember, boolean member) { 124 124 Color myColor = color; -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaIconElement.java
r12756 r13662 4 4 import java.util.Objects; 5 5 6 import org.openstreetmap.josm.data.osm. OsmPrimitive;6 import org.openstreetmap.josm.data.osm.IPrimitive; 7 7 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 8 8 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; … … 43 43 44 44 @Override 45 public void paintPrimitive( OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter,45 public void paintPrimitive(IPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, 46 46 boolean selected, boolean outermember, boolean member) { 47 47 if (painter.isShowIcons()) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
r12476 r13662 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.osm.IPrimitive; 9 10 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.OsmPrimitive;11 11 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 12 12 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors; … … 282 282 283 283 @Override 284 public void paintPrimitive( OsmPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter,284 public void paintPrimitive(IPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter, 285 285 boolean selected, boolean outermember, boolean member) { 286 286 if (osm instanceof Node) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
r13013 r13662 8 8 import java.util.Optional; 9 9 10 import org.openstreetmap.josm.data.osm.IPrimitive; 10 11 import org.openstreetmap.josm.data.osm.Node; 11 import org.openstreetmap.josm.data.osm.OsmPrimitive;12 12 import org.openstreetmap.josm.data.osm.Way; 13 13 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; … … 110 110 111 111 @Override 112 public void paintPrimitive( OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,112 public void paintPrimitive(IPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 113 113 boolean selected, boolean outermember, boolean member) { 114 114 /* show direction arrows, if draw.segment.relevant_directions_only is not set, -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r12846 r13662 10 10 import java.util.stream.IntStream; 11 11 12 import org.openstreetmap.josm.data.osm.IPrimitive; 12 13 import org.openstreetmap.josm.data.osm.Node; 13 import org.openstreetmap.josm.data.osm.OsmPrimitive;14 14 import org.openstreetmap.josm.data.osm.Relation; 15 15 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; … … 267 267 268 268 @Override 269 public void paintPrimitive( OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter,269 public void paintPrimitive(IPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, 270 270 boolean selected, boolean outermember, boolean member) { 271 271 if (primitive instanceof Node) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
r12303 r13662 4 4 import java.util.Objects; 5 5 6 import org.openstreetmap.josm.data.osm. OsmPrimitive;6 import org.openstreetmap.josm.data.osm.IPrimitive; 7 7 import org.openstreetmap.josm.data.osm.Way; 8 8 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; … … 120 120 121 121 @Override 122 public void paintPrimitive( OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,122 public void paintPrimitive(IPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 123 123 boolean selected, boolean outermember, boolean member) { 124 124 if (primitive instanceof Way) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
r12846 r13662 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.osm.IPrimitive; 9 10 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 11 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; … … 88 89 * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation 89 90 * @param member true, if primitive is not selected and member of a selected relation 90 */ 91 public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 91 * @since 13662 (signature) 92 */ 93 public abstract void paintPrimitive(IPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 92 94 boolean selected, boolean outermember, boolean member); 93 95 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
r12476 r13662 4 4 import java.util.Objects; 5 5 6 import org.openstreetmap.josm.data.osm. OsmPrimitive;6 import org.openstreetmap.josm.data.osm.IPrimitive; 7 7 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 8 8 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors; … … 88 88 89 89 @Override 90 public void paintPrimitive( OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,90 public void paintPrimitive(IPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 91 91 boolean selected, boolean outermember, boolean member) { 92 92 painter.drawText(primitive, text, getLabelPositionStrategy()); -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
r12476 r13662 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.osm.IPrimitive; 9 10 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 11 import org.openstreetmap.josm.gui.mappaint.Cascade; … … 184 185 * derived for {@code osm} 185 186 */ 186 public String getString( OsmPrimitive osm) {187 public String getString(IPrimitive osm) { 187 188 if (labelCompositionStrategy == null) return null; 188 189 return labelCompositionStrategy.compose(osm);
Note:
See TracChangeset
for help on using the changeset viewer.