Changeset 5925 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2013-05-05T19:03:05+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r5881 r5925 407 407 targetDataSet.beginUpdate(); 408 408 try { 409 409 ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes()); 410 410 for (Node node: sourceDataSet.getNodes()) { 411 411 mergePrimitive(node, candidates); -
trunk/src/org/openstreetmap/josm/data/validation/TestError.java
r5911 r5925 132 132 */ 133 133 public Collection<? extends OsmPrimitive> getSelectablePrimitives() { 134 135 136 137 138 139 134 List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size()); 135 for (OsmPrimitive o : primitives) { 136 if (o.isSelectable()) { 137 selectablePrimitives.add(o); 138 } 139 } 140 140 return selectablePrimitives; 141 141 }
Note:
See TracChangeset
for help on using the changeset viewer.