Changeset 4580 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
- Timestamp:
- 2011-11-06T15:00:56+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r4414 r4580 1175 1175 return ret; 1176 1176 } 1177 1178 /** 1179 * Moves all primitives and datasources from DataSet "from" to this DataSet 1180 * @param from The source DataSet 1181 */ 1182 public void mergeFrom(DataSet from) { 1183 if (from != null) { 1184 for (Node n : from.getNodes()) { 1185 from.removePrimitive(n); 1186 addPrimitive(n); 1187 } 1188 for (Way w : from.getWays()) { 1189 from.removePrimitive(w); 1190 addPrimitive(w); 1191 } 1192 for (Relation r : from.getRelations()) { 1193 from.removePrimitive(r); 1194 addPrimitive(r); 1195 } 1196 dataSources.addAll(from.dataSources); 1197 from.dataSources.clear(); 1198 } 1199 } 1177 1200 1178 1201 /* --------------------------------------------------------------------------------- */
Note:
See TracChangeset
for help on using the changeset viewer.