Changeset 2609 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2009-12-11T20:24:41+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r2591 r2609 145 145 if (myWay == null) 146 146 throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId())); 147 myWay.setHasIncompleteNodes();148 147 } 149 148 … … 163 162 throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId())); 164 163 if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return; 165 166 for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {167 w.setHasIncompleteNodes();168 }169 164 } 170 165 -
trunk/src/org/openstreetmap/josm/data/osm/Way.java
r2591 r2609 26 26 private Node[] nodes = new Node[0]; 27 27 private BBox bbox; 28 private boolean hasIncompleteNodes;29 28 30 29 /** … … 377 376 } 378 377 379 //TODO This method should not be necessary. hasIncomplete state should be updated automatically when incomplete state of nodes change 380 public void setHasIncompleteNodes() { 381 hasIncompleteNodes = false; 378 public boolean hasIncompleteNodes() { 382 379 for (Node node:getNodes()) { 383 if (node.isIncomplete()) { 384 hasIncompleteNodes = true; 385 break; 386 } 387 } 388 } 389 390 public boolean hasIncompleteNodes() { 391 return hasIncompleteNodes; 380 if (node.isIncomplete()) 381 return true; 382 } 383 return false; 392 384 } 393 385
Note:
See TracChangeset
for help on using the changeset viewer.