Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 10311) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 10312) @@ -659,5 +659,5 @@ } drawArea(r, p, - pd.selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color, + pd.isSelected() ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color, fillImage, extent, pfClip, disabled, text); } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 10311) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 10312) @@ -124,5 +124,5 @@ } - public boolean isOuterRole(String role) { + boolean isOuterRole(String role) { if (role == null) return false; for (String candidate: outerExactRoles) { @@ -135,5 +135,5 @@ } - public boolean isInnerRole(String role) { + boolean isInnerRole(String role) { if (role == null) return false; for (String candidate: innerExactRoles) { @@ -164,32 +164,81 @@ public static class JoinedWay { - private final List nodes; - private final Collection wayIds; - private final boolean selected; - + protected final List nodes; + protected final Collection wayIds; + protected boolean selected; + + /** + * Constructs a new {@code JoinedWay}. + * @param nodes list of nodes + * @param wayIds list of way IDs + * @param selected whether joined way is selected or not + */ public JoinedWay(List nodes, Collection wayIds, boolean selected) { - this.nodes = nodes; - this.wayIds = wayIds; + this.nodes = new ArrayList<>(nodes); + this.wayIds = new ArrayList<>(wayIds); this.selected = selected; } + /** + * Replies the list of nodes. + * @return the list of nodes + */ public List getNodes() { - return nodes; - } - + return Collections.unmodifiableList(nodes); + } + + /** + * Replies the list of way IDs. + * @return the list of way IDs + */ public Collection getWayIds() { - return wayIds; - } - - public boolean isSelected() { + return Collections.unmodifiableCollection(wayIds); + } + + /** + * Determines if this is selected. + * @return {@code true} if this is selected + */ + public final boolean isSelected() { return selected; } + /** + * Sets whether this is selected + * @param selected {@code true} if this is selected + * @since 10312 + */ + public final void setSelected(boolean selected) { + this.selected = selected; + } + + /** + * Determines if this joined way is closed. + * @return {@code true} if this joined way is closed + */ public boolean isClosed() { - return nodes.isEmpty() || nodes.get(nodes.size() - 1).equals(nodes.get(0)); - } - } - - public static class PolyData { + return nodes.isEmpty() || getLastNode().equals(getFirstNode()); + } + + /** + * Returns the first node. + * @return the first node + * @since 10312 + */ + public Node getFirstNode() { + return nodes.get(0); + } + + /** + * Returns the last node. + * @return the last node + * @since 10312 + */ + public Node getLastNode() { + return nodes.get(nodes.size() - 1); + } + } + + public static class PolyData extends JoinedWay { public enum Intersection { INSIDE, @@ -199,26 +248,39 @@ private final Path2D.Double poly; - public boolean selected; private Rectangle2D bounds; - private final Collection wayIds; - private final List nodes; private final List inners; + /** + * Constructs a new {@code PolyData} from a closed way. + * @param closedWay closed way + */ public PolyData(Way closedWay) { this(closedWay.getNodes(), closedWay.isSelected(), Collections.singleton(closedWay.getUniqueId())); } + /** + * Constructs a new {@code PolyData} from a {@link JoinedWay}. + * @param joinedWay joined way + */ public PolyData(JoinedWay joinedWay) { - this(joinedWay.getNodes(), joinedWay.isSelected(), joinedWay.getWayIds()); + this(joinedWay.nodes, joinedWay.selected, joinedWay.wayIds); } private PolyData(List nodes, boolean selected, Collection wayIds) { - this.wayIds = Collections.unmodifiableCollection(wayIds); - this.nodes = new ArrayList<>(nodes); - this.selected = selected; + super(nodes, wayIds, selected); this.inners = new ArrayList<>(); this.poly = new Path2D.Double(); this.poly.setWindingRule(Path2D.WIND_EVEN_ODD); buildPoly(); + } + + /** + * Constructs a new {@code PolyData} from an existing {@code PolyData}. + * @param copy existing instance + */ + public PolyData(PolyData copy) { + super(copy.nodes, copy.wayIds, copy.selected); + this.poly = (Path2D.Double) copy.poly.clone(); + this.inners = new ArrayList<>(copy.inners); } @@ -242,12 +304,4 @@ appendInner(inner.poly); } - } - - public PolyData(PolyData copy) { - this.selected = copy.selected; - this.poly = (Path2D.Double) copy.poly.clone(); - this.wayIds = Collections.unmodifiableCollection(copy.wayIds); - this.nodes = new ArrayList<>(copy.nodes); - this.inners = new ArrayList<>(copy.inners); } @@ -293,14 +347,6 @@ } - public Collection getWayIds() { - return wayIds; - } - - public List getNodes() { - return nodes; - } - public List getInners() { - return inners; + return Collections.unmodifiableList(inners); } @@ -370,8 +416,11 @@ } + @Override public boolean isClosed() { - if (nodes.size() < 3 || nodes.get(0) != nodes.get(nodes.size() - 1)) return false; + if (nodes.size() < 3 || !getFirstNode().equals(getLastNode())) + return false; for (PolyData inner : inners) { - if (!inner.isClosed()) return false; + if (!inner.isClosed()) + return false; } return true; @@ -404,4 +453,8 @@ private boolean incomplete; + /** + * Constructs a new {@code Multipolygon} from a relation. + * @param r relation + */ public Multipolygon(Relation r) { load(r); @@ -415,21 +468,17 @@ if (m.getMember().isIncomplete()) { this.incomplete = true; - } else if (m.getMember().isDrawable()) { - if (m.isWay()) { - Way w = m.getWay(); - - if (w.getNodesCount() < 2) { - continue; - } - - if (matcher.isInnerRole(m.getRole())) { - innerWays.add(w); - } else if (matcher.isOuterRole(m.getRole())) { - outerWays.add(w); - } else if (!m.hasRole()) { - outerWays.add(w); - } // Remaining roles ignored - } // Non ways ignored - } + } else if (m.getMember().isDrawable() && m.isWay()) { + Way w = m.getWay(); + + if (w.getNodesCount() < 2) { + continue; + } + + if (matcher.isInnerRole(m.getRole())) { + innerWays.add(w); + } else if (!m.hasRole() || matcher.isOuterRole(m.getRole())) { + outerWays.add(w); + } // Remaining roles ignored + } // Non ways ignored } @@ -443,4 +492,8 @@ } + /** + * Determines if this multipolygon is incomplete. + * @return {@code true} if this multipolygon is incomplete + */ public final boolean isIncomplete() { return incomplete; @@ -460,6 +513,6 @@ result.add(new PolyData(jw)); if (!jw.isClosed()) { - openEnds.add(jw.getNodes().get(0)); - openEnds.add(jw.getNodes().get(jw.getNodes().size() - 1)); + openEnds.add(jw.getFirstNode()); + openEnds.add(jw.getLastNode()); } } @@ -560,5 +613,4 @@ public PolyData findOuterPolygon(PolyData inner, List outerPolygons) { - // First try to test only bbox, use precise testing only if we don't get unique result Rectangle2D innerBox = inner.getBounds(); @@ -595,5 +647,4 @@ private void addInnerToOuters(List innerPolygons, List outerPolygons) { - if (innerPolygons.isEmpty()) { combinedPolygons.addAll(outerPolygons); @@ -624,5 +675,5 @@ */ public List getOuterWays() { - return outerWays; + return Collections.unmodifiableList(outerWays); } @@ -632,11 +683,19 @@ */ public List getInnerWays() { - return innerWays; - } - + return Collections.unmodifiableList(innerWays); + } + + /** + * Replies the list of combined polygons. + * @return the list of combined polygons + */ public List getCombinedPolygons() { - return combinedPolygons; - } - + return Collections.unmodifiableList(combinedPolygons); + } + + /** + * Replies the list of inner polygons. + * @return the list of inner polygons + */ public List getInnerPolygons() { final List innerPolygons = new ArrayList<>(); @@ -645,4 +704,8 @@ } + /** + * Replies the list of outer polygons. + * @return the list of outer polygons + */ public List getOuterPolygons() { final List outerPolygons = new ArrayList<>(); @@ -656,5 +719,5 @@ */ public List getOpenEnds() { - return openEnds; + return Collections.unmodifiableList(openEnds); } } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (revision 10311) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (revision 10312) @@ -97,5 +97,5 @@ map2.put(r, multipolygon); for (PolyData pd : multipolygon.getCombinedPolygons()) { - if (pd.selected) { + if (pd.isSelected()) { selectedPolyData.add(pd); } @@ -311,5 +311,5 @@ for (Iterator it = selectedPolyData.iterator(); it.hasNext();) { - it.next().selected = false; + it.next().setSelected(false); it.remove(); } @@ -332,5 +332,5 @@ for (PolyData pd : multipolygon.getCombinedPolygons()) { if (pd.getWayIds().contains(p.getUniqueId())) { - pd.selected = true; + pd.setSelected(true); selectedPolyData.add(pd); }