Changeset 2444 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

2009-11-13T11:34:34+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3908: Exception when updating a way
fixed a few I18n issues

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -135 +135 @@
     }
 
-    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) {
+    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{
         Long targetId = mergedMap.get(mergeSource.getUniqueId());
         if (targetId == null)
-            throw new RuntimeException(tr("Missing merge target for way with id {0}", mergeSource.getUniqueId()));
+            return null;
         return targetDataSet.getPrimitiveById(targetId, mergeSource.getType());
     }
@@ -306 +306 @@
             childrenToMerge.add(source.getUniqueId());
         } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) {
-            // my is same as other but mine is modified
-            // => keep mine
+            // target is same as source but target is modified
+            // => keep target
         } else if (! target.hasEqualSemanticAttributes(source)) {
-            // my is modified and is not semantically equal with other. Can't automatically
+            // target is modified and is not semantically equal with source. Can't automatically
             // resolve the differences
             // =>  create a conflict