Changeset 4253 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
- Timestamp:
- 2011-07-16T21:08:34+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r3965 r4253 180 180 OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId()); 181 181 if (source == null) 182 throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it' s missing in the source dataset",182 throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset", 183 183 target.getType(), target.getUniqueId())); 184 184 … … 314 314 // For example, datasets can be fetched from different OSM servers or badly hand-modified. 315 315 // We shouldn't merge that datasets. 316 throw new DataIntegrityProblemException(tr("Conflict in ' visible' attribute for object of type {0} with id {1}",316 throw new DataIntegrityProblemException(tr("Conflict in ''visible'' attribute for object of type {0} with id {1}", 317 317 target.getType(), target.getId())); 318 318 else if (target.isDeleted() && ! source.isDeleted() && target.getVersion() == source.getVersion()) {
Note:
See TracChangeset
for help on using the changeset viewer.