Changeset 13919 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement
- Timestamp:
- 2018-06-11T20:52:44+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
r13662 r13919 8 8 9 9 import org.openstreetmap.josm.data.osm.IPrimitive; 10 import org.openstreetmap.josm.data.osm.IWay; 10 11 import org.openstreetmap.josm.data.osm.Relation; 11 import org.openstreetmap.josm.data.osm.Way;12 12 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 13 13 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; … … 123 123 boolean selected, boolean outermember, boolean member) { 124 124 Color myColor = color; 125 if (osm instanceof Way) {125 if (osm instanceof IWay) { 126 126 if (color != null) { 127 127 if (selected) { … … 131 131 } 132 132 } 133 painter.drawArea(( Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled());133 painter.drawArea((IWay<?>) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled()); 134 134 } else if (osm instanceof Relation) { 135 135 if (color != null && (selected || outermember)) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
r13662 r13919 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.osm.INode; 9 10 import org.openstreetmap.josm.data.osm.IPrimitive; 10 11 import org.openstreetmap.josm.data.osm.Node; … … 284 285 public void paintPrimitive(IPrimitive osm, MapPaintSettings settings, StyledMapRenderer painter, 285 286 boolean selected, boolean outermember, boolean member) { 286 if (osm instanceof Node) {287 painter.drawBoxText(( Node) osm, this);287 if (osm instanceof INode) { 288 painter.drawBoxText((INode) osm, this); 288 289 } 289 290 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
r13662 r13919 8 8 import java.util.Optional; 9 9 10 import org.openstreetmap.josm.data.osm.INode; 10 11 import org.openstreetmap.josm.data.osm.IPrimitive; 11 import org.openstreetmap.josm.data.osm. Node;12 import org.openstreetmap.josm.data.osm.IWay; 12 13 import org.openstreetmap.josm.data.osm.Way; 13 14 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; … … 128 129 the direction should be shown at all and not only because it's selected */ 129 130 boolean showOnlyHeadArrowOnly = showOrientation && !selected && paintSettings.isShowHeadArrowOnly(); 130 Node lastN;131 INode lastN; 131 132 132 133 Color myDashedColor = dashesBackground; … … 155 156 } 156 157 157 if (primitive instanceof Way) {158 Way w = (Way) primitive;158 if (primitive instanceof IWay) { 159 IWay<?> w = (IWay<?>) primitive; 159 160 painter.drawWay(w, myColor, myLine, myDashLine, myDashedColor, offset, showOrientation, 160 161 showOnlyHeadArrowOnly, showOneway, onewayReversed); … … 164 165 int orderNumber = 0; 165 166 lastN = null; 166 for ( Node n : w.getNodes()) {167 for (INode n : w.getNodes()) { 167 168 if (lastN != null) { 168 169 orderNumber++; … … 245 246 246 247 /** 247 * Creates a simple line with default widt .248 * Creates a simple line with default width. 248 249 * @param color The color to use 249 250 * @param isAreaEdge If this is an edge for an area. Edges are drawn at lower Z-Index. … … 259 260 c.put(Z_INDEX, -3f); 260 261 } 261 Way w = new Way(); 262 return createLine(new Environment(w, mc, "default", null)); 262 return createLine(new Environment(new Way(), mc, "default", null)); 263 263 } 264 264 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r13662 r13919 10 10 import java.util.stream.IntStream; 11 11 12 import org.openstreetmap.josm.data.osm.INode; 12 13 import org.openstreetmap.josm.data.osm.IPrimitive; 13 import org.openstreetmap.josm.data.osm.Node; 14 import org.openstreetmap.josm.data.osm.Relation; 14 import org.openstreetmap.josm.data.osm.IRelation; 15 15 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 16 16 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; … … 269 269 public void paintPrimitive(IPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, 270 270 boolean selected, boolean outermember, boolean member) { 271 if (primitive instanceof Node) {272 Node n = (Node) primitive;271 if (primitive instanceof INode) { 272 INode n = (INode) primitive; 273 273 if (mapImage != null && painter.isShowIcons()) { 274 274 painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member, … … 314 314 315 315 } 316 } else if (primitive instanceof Relation && mapImage != null) {317 painter.drawRestriction(( Relation) primitive, mapImage, painter.isInactiveMode() || primitive.isDisabled());316 } else if (primitive instanceof IRelation && mapImage != null) { 317 painter.drawRestriction((IRelation<?>) primitive, mapImage, painter.isInactiveMode() || primitive.isDisabled()); 318 318 } 319 319 } 320 320 321 321 private void paintWithSymbol(MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member, 322 Node n) {322 INode n) { 323 323 Color fillColor = symbol.fillColor; 324 324 if (fillColor != null) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
r13662 r13919 5 5 6 6 import org.openstreetmap.josm.data.osm.IPrimitive; 7 import org.openstreetmap.josm.data.osm. Way;7 import org.openstreetmap.josm.data.osm.IWay; 8 8 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings; 9 9 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; … … 122 122 public void paintPrimitive(IPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, 123 123 boolean selected, boolean outermember, boolean member) { 124 if (primitive instanceof Way) {125 Way w = (Way) primitive;124 if (primitive instanceof IWay) { 125 IWay<?> w = (IWay<?>) primitive; 126 126 painter.drawRepeatImage(w, pattern, painter.isInactiveMode() || w.isDisabled(), offset, spacing, phase, align); 127 127 }
Note:
See TracChangeset
for help on using the changeset viewer.