Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 2417) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 2418) @@ -5,7 +5,9 @@ import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.logging.Logger; @@ -38,5 +40,9 @@ * Key is the primitive id in their dataset, the value is the id in my dataset */ - private Map merged; + private Map mergedMap; + /** a set of primitive ids for which we have to fix references (to nodes and + * to relation members) after the first phase of merging + */ + private Set fixReferences; /** @@ -52,5 +58,6 @@ this.theirDataSet = theirDataSet; conflicts = new ConflictCollection(); - merged = new HashMap(); + mergedMap = new HashMap(); + fixReferences = new HashSet(); } @@ -91,9 +98,9 @@ } if (my.hasEqualSemanticAttributes(other)) { + mergedMap.put(other.getUniqueId(), my.getUniqueId()); if (my.isDeleted() != other.isDeleted()) { // differences in deleted state have to be merged manually // conflicts.add(my, other); - merged.put(other.getUniqueId(), my.getUniqueId()); } else { // copy the technical attributes from other @@ -103,5 +110,5 @@ my.setTimestamp(other.getTimestamp()); my.setModified(other.isModified()); - merged.put(other.getUniqueId(), my.getUniqueId()); + fixReferences.add(other.getUniqueId()); } return; @@ -120,5 +127,6 @@ my.mergeFrom(other); myDataSet.addPrimitive(my); - merged.put(other.getUniqueId(), my.getUniqueId()); + mergedMap.put(other.getUniqueId(), my.getUniqueId()); + fixReferences.add(other.getUniqueId()); } @@ -136,7 +144,7 @@ protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) { - Long targetId = merged.get(mergeSource.getUniqueId()); + Long targetId = mergedMap.get(mergeSource.getUniqueId()); if (targetId == null) - throw new RuntimeException("no merge target for merge primitive " + mergeSource.getUniqueId() + " of type " + mergeSource.getType()); + throw new RuntimeException(tr("Missing merge target for way with id {0}", mergeSource.getUniqueId())); return myDataSet.getPrimitiveById(targetId, mergeSource.getType()); } @@ -160,5 +168,5 @@ public void fixReferences() { for (Way w : theirDataSet.getWays()) { - if (!conflicts.hasConflictForTheir(w)) { + if (!conflicts.hasConflictForTheir(w) && fixReferences.contains(w.getUniqueId())) { mergeNodeList(w); fixIncomplete(w); @@ -166,5 +174,5 @@ } for (Relation r : theirDataSet.getRelations()) { - if (!conflicts.hasConflictForTheir(r)) { + if (!conflicts.hasConflictForTheir(r) && fixReferences.contains(r.getUniqueId())) { mergeRelationMembers(r); } @@ -262,95 +270,83 @@ // merge other into an existing primitive with the same id, if possible // - if (my != null) { - if (my.getVersion() <= other.getVersion()) { - if (! my.isVisible() && other.isVisible()) { - // should not happen - // - logger.warning(tr("My primitive with id {0} and version {1} is visible although " - + "their primitive with lower version {2} is not visible. " - + "Can't deal with this inconsistency. Keeping my primitive. ", - Long.toString(my.getId()),Long.toString(my.getVersion()), Long.toString(other.getVersion()) - )); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (my.isVisible() && ! other.isVisible()) { - // this is always a conflict because the user has to decide whether - // he wants to create a clone of its local primitive or whether he - // wants to purge my from the local dataset. He can't keep it unchanged - // because it was deleted on the server. - // - conflicts.add(my,other); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (my.incomplete && !other.incomplete) { - // my is incomplete, other completes it - // => merge other onto my - // - my.mergeFrom(other); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (!my.incomplete && other.incomplete) { - // my is complete and the other is incomplete - // => keep mine, we have more information already - // - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (my.incomplete && other.incomplete) { - // my and other are incomplete. Doesn't matter which one to - // take. We take mine. - // - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (my.isDeleted() && ! other.isDeleted() && my.getVersion() == other.getVersion()) { - // same version, but my is deleted. Assume mine takes precedence - // otherwise too many conflicts when refreshing from the server - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (my.isDeleted() != other.isDeleted()) { - // differences in deleted state have to be resolved manually - // - conflicts.add(my,other); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (! my.isModified() && other.isModified()) { - // my not modified. We can assume that other is the most recent version. - // clone it onto my. But check first, whether other is deleted. if so, - // make sure that my is not references anymore in myDataSet. - // - if (other.isDeleted()) { - myDataSet.unlinkReferencesToPrimitive(my); - } - my.mergeFrom(other); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (! my.isModified() && !other.isModified() && my.getVersion() == other.getVersion()) { - // both not modified. Keep mine - // - merged.put(other.getUniqueId(),my.getUniqueId()); - } else if (! my.isModified() && !other.isModified() && my.getVersion() < other.getVersion()) { - // my not modified but other is newer. clone other onto mine. - // - my.mergeFrom(other); - merged.put(other.getUniqueId(),my.getUniqueId()); - } else if (my.isModified() && ! other.isModified() && my.getVersion() == other.getVersion()) { - // my is same as other but mine is modified - // => keep mine - merged.put(other.getUniqueId(), my.getUniqueId()); - } else if (! my.hasEqualSemanticAttributes(other)) { - // my is modified and is not semantically equal with other. Can't automatically - // resolve the differences - // => create a conflict - conflicts.add(my,other); - merged.put(other.getUniqueId(), my.getUniqueId()); - } else { - // clone from other, but keep the modified flag. Clone will mainly copy - // technical attributes like timestamp or user information. Semantic - // attributes should already be equal if we get here. - // - my.mergeFrom(other); - my.setModified(true); - merged.put(other.getUniqueId(), my.getUniqueId()); - } - } else { - // my.version > other.version => keep my version - merged.put(other.getUniqueId(), my.getUniqueId()); - } + if (my == null) + return false; + mergedMap.put(other.getUniqueId(), my.getUniqueId()); + if (my.getVersion() > other.getVersion()) + // my.version > other.version => keep my version return true; - } - return false; - } - + if (! my.isVisible() && other.isVisible()) { + // should not happen + // + logger.warning(tr("My primitive with id {0} and version {1} is visible although " + + "their primitive with lower version {2} is not visible. " + + "Can't deal with this inconsistency. Keeping my primitive. ", + Long.toString(my.getId()),Long.toString(my.getVersion()), Long.toString(other.getVersion()) + )); + } else if (my.isVisible() && ! other.isVisible()) { + // this is always a conflict because the user has to decide whether + // he wants to create a clone of its local primitive or whether he + // wants to purge my from the local dataset. He can't keep it unchanged + // because it was deleted on the server. + // + conflicts.add(my,other); + } else if (my.incomplete && !other.incomplete) { + // my is incomplete, other completes it + // => merge other onto my + // + my.mergeFrom(other); + fixReferences.add(other.getUniqueId()); + } else if (!my.incomplete && other.incomplete) { + // my is complete and the other is incomplete + // => keep mine, we have more information already + // + } else if (my.incomplete && other.incomplete) { + // my and other are incomplete. Doesn't matter which one to + // take. We take mine. + // + } else if (my.isDeleted() && ! other.isDeleted() && my.getVersion() == other.getVersion()) { + // same version, but my is deleted. Assume mine takes precedence + // otherwise too many conflicts when refreshing from the server + } else if (my.isDeleted() != other.isDeleted()) { + // differences in deleted state have to be resolved manually + // + conflicts.add(my,other); + } else if (! my.isModified() && other.isModified()) { + // my not modified. We can assume that other is the most recent version. + // clone it onto my. But check first, whether other is deleted. if so, + // make sure that my is not references anymore in myDataSet. + // + if (other.isDeleted()) { + myDataSet.unlinkReferencesToPrimitive(my); + } + my.mergeFrom(other); + fixReferences.add(other.getUniqueId()); + } else if (! my.isModified() && !other.isModified() && my.getVersion() == other.getVersion()) { + // both not modified. Keep mine + // + } else if (! my.isModified() && !other.isModified() && my.getVersion() < other.getVersion()) { + // my not modified but other is newer. clone other onto mine. + // + my.mergeFrom(other); + fixReferences.add(other.getUniqueId()); + } else if (my.isModified() && ! other.isModified() && my.getVersion() == other.getVersion()) { + // my is same as other but mine is modified + // => keep mine + } else if (! my.hasEqualSemanticAttributes(other)) { + // my is modified and is not semantically equal with other. Can't automatically + // resolve the differences + // => create a conflict + conflicts.add(my,other); + } else { + // clone from other, but keep the modified flag. mergeFrom will mainly copy + // technical attributes like timestamp or user information. Semantic + // attributes should already be equal if we get here. + // + my.mergeFrom(other); + my.setModified(true); + fixReferences.add(other.getUniqueId()); + } + return true; + } /**