- Timestamp:
- 2018-06-11T20:52:44+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
r12505 r13919 7 7 import java.util.stream.Collectors; 8 8 9 import org.openstreetmap.josm.data.osm. Node;9 import org.openstreetmap.josm.data.osm.INode; 10 10 import org.openstreetmap.josm.gui.MapViewState; 11 11 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint; … … 55 55 * @param offset The offset of the line. 56 56 */ 57 public OffsetIterator(MapViewState mapState, List< Node> nodes, double offset) {57 public OffsetIterator(MapViewState mapState, List<? extends INode> nodes, double offset) { 58 58 this.mapState = mapState; 59 this.nodes = nodes.stream().filter( Node::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList());59 this.nodes = nodes.stream().filter(INode::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList()); 60 60 this.offset = offset; 61 61 } -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r13852 r13919 49 49 import org.openstreetmap.josm.data.osm.IPrimitive; 50 50 import org.openstreetmap.josm.data.osm.IRelation; 51 import org.openstreetmap.josm.data.osm.IRelationMember; 51 52 import org.openstreetmap.josm.data.osm.IWay; 52 53 import org.openstreetmap.josm.data.osm.Node; … … 55 56 import org.openstreetmap.josm.data.osm.OsmUtils; 56 57 import org.openstreetmap.josm.data.osm.Relation; 57 import org.openstreetmap.josm.data.osm.RelationMember;58 58 import org.openstreetmap.josm.data.osm.Way; 59 59 import org.openstreetmap.josm.data.osm.WaySegment; … … 526 526 * @since 12285 527 527 */ 528 public void drawArea( Wayw, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {528 public void drawArea(IWay<?> w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) { 529 529 Path2D.Double pfClip = null; 530 530 if (extent != null) { … … 561 561 * @param bs The text and it's alignment. 562 562 */ 563 public void drawBoxText( Node n, BoxTextElement bs) {563 public void drawBoxText(INode n, BoxTextElement bs) { 564 564 if (!isShowNames() || bs == null) 565 565 return; … … 631 631 * @param align alignment of the image. The top, center or bottom edge can be aligned with the way. 632 632 */ 633 public void drawRepeatImage( Wayway, MapImage pattern, boolean disabled, double offset, double spacing, double phase,633 public void drawRepeatImage(IWay<?> way, MapImage pattern, boolean disabled, double offset, double spacing, double phase, 634 634 LineImageAlignment align) { 635 635 final int imgWidth = pattern.getWidth(); … … 730 730 * @param theta the angle of rotation in radians 731 731 */ 732 public void drawNodeIcon( Node n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) {732 public void drawNodeIcon(INode n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) { 733 733 MapViewPoint p = mapState.getPointFor(n); 734 734 … … 821 821 * @param strokeColor The color to use for the outer corner of the symbol 822 822 */ 823 public void drawNodeSymbol( Node n, Symbol s, Color fillColor, Color strokeColor) {823 public void drawNodeSymbol(INode n, Symbol s, Color fillColor, Color strokeColor) { 824 824 MapViewPoint p = mapState.getPointFor(n); 825 825 … … 853 853 * @param clr The color to use for drawing the text. 854 854 */ 855 public void drawOrderNumber( Node n1,Node n2, int orderNumber, Color clr) {855 public void drawOrderNumber(INode n1, INode n2, int orderNumber, Color clr) { 856 856 MapViewPoint p1 = mapState.getPointFor(n1); 857 857 MapViewPoint p2 = mapState.getPointFor(n2); … … 929 929 * @param disabled draw using disabled style 930 930 */ 931 public void drawRestriction( Relationr, MapImage icon, boolean disabled) {932 WayfromWay = null;933 WaytoWay = null;934 OsmPrimitive via = null;931 public void drawRestriction(IRelation<?> r, MapImage icon, boolean disabled) { 932 IWay<?> fromWay = null; 933 IWay<?> toWay = null; 934 IPrimitive via = null; 935 935 936 936 /* find the "from", "via" and "to" elements */ 937 for ( RelationMemberm : r.getMembers()) {937 for (IRelationMember<?> m : r.getMembers()) { 938 938 if (m.getMember().isIncomplete()) 939 939 return; 940 940 else { 941 941 if (m.isWay()) { 942 Way w = m.getWay();942 IWay<?> w = (IWay<?>) m.getMember(); 943 943 if (w.getNodesCount() < 2) { 944 944 continue; … … 964 964 } 965 965 } else if (m.isNode()) { 966 Node n = m.getNode();966 INode n = (INode) m.getMember(); 967 967 if (via == null && "via".equals(m.getRole())) { 968 968 via = n; … … 1007 1007 1008 1008 /* find the "direct" nodes before the via node */ 1009 Node fromNode;1009 INode fromNode; 1010 1010 if (fromWay.firstNode() == via) { 1011 1011 fromNode = fromWay.getNode(1); … … 1227 1227 * @param onewayReversed for oneway=-1 and similar 1228 1228 */ 1229 public void drawWay( Wayway, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, float offset,1229 public void drawWay(IWay<?> way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, float offset, 1230 1230 boolean showOrientation, boolean showHeadArrowOnly, 1231 1231 boolean showOneway, boolean onewayReversed) { … … 1241 1241 } 1242 1242 1243 List< Node> wayNodes = way.getNodes();1243 List<? extends INode> wayNodes = way.getNodes(); 1244 1244 if (wayNodes.size() < 2) return; 1245 1245 … … 1410 1410 } 1411 1411 1412 private MapViewPath getPath( Wayw) {1412 private MapViewPath getPath(IWay<?> w) { 1413 1413 MapViewPath path = new MapViewPath(mapState); 1414 1414 if (w.isClosed()) { … … 1420 1420 } 1421 1421 1422 private static Path2D.Double getPFClip( Wayw, double extent) {1422 private static Path2D.Double getPFClip(IWay<?> w, double extent) { 1423 1423 Path2D.Double clip = new Path2D.Double(); 1424 1424 buildPFClip(clip, w.getNodes(), extent); … … 1451 1451 * @param extent the extent 1452 1452 */ 1453 private static void buildPFClip(Path2D.Double clip, List< Node> nodes, double extent) {1453 private static void buildPFClip(Path2D.Double clip, List<? extends INode> nodes, double extent) { 1454 1454 boolean initial = true; 1455 for ( Node n : nodes) {1455 for (INode n : nodes) { 1456 1456 EastNorth p = n.getEastNorth(); 1457 1457 if (p != null) { -
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 } -
trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java
r10691 r13919 6 6 import java.util.Iterator; 7 7 import java.util.NoSuchElementException; 8 import java.util.Objects; 8 9 import java.util.function.Predicate; 9 10 … … 76 77 */ 77 78 public SubclassFilteredCollection(Collection<? extends S> collection, Predicate<? super S> predicate) { 78 this.collection = collection;79 this.predicate = predicate;79 this.collection = Objects.requireNonNull(collection); 80 this.predicate = Objects.requireNonNull(predicate); 80 81 } 81 82
Note:
See TracChangeset
for help on using the changeset viewer.