Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 2433) @@ -18,7 +18,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -210,5 +210,5 @@ } - MergeVisitor visitor = new MergeVisitor(targetLayer.data, parents); + DataSetMerger visitor = new DataSetMerger(targetLayer.data, parents); visitor.merge(); SwingUtilities.invokeLater( @@ -239,5 +239,5 @@ reader = null; } - MergeVisitor visitor = new MergeVisitor(parents, ds); + DataSetMerger visitor = new DataSetMerger(parents, ds); visitor.merge(); } Index: trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 2433) @@ -15,4 +15,5 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -20,5 +21,4 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.ExceptionDialogUtil; import org.openstreetmap.josm.gui.PleaseWaitRunnable; @@ -213,5 +213,5 @@ initMultiFetchReaderWithRelations(reader); theirDataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); - MergeVisitor merger = new MergeVisitor(ds, theirDataSet); + DataSetMerger merger = new DataSetMerger(ds, theirDataSet); merger.merge(); // a ways loaded with MultiFetch may be incomplete because at least one of its @@ -223,5 +223,5 @@ OsmServerObjectReader reader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */); theirDataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)); - merger = new MergeVisitor(ds, theirDataSet); + merger = new DataSetMerger(ds, theirDataSet); merger.merge(); } Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 2433) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 2433) @@ -0,0 +1,379 @@ +package org.openstreetmap.josm.data.osm; + +import static org.openstreetmap.josm.tools.I18n.tr; + +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; + +import org.openstreetmap.josm.data.conflict.ConflictCollection; + +/** + * A dataset merger which takes a target and a source dataset and merges the source data set + * onto the target dataset. + * + */ +public class DataSetMerger { + private static Logger logger = Logger.getLogger(DataSetMerger.class.getName()); + + /** the collection of conflicts created during merging */ + private ConflictCollection conflicts; + + /** the target dataset for merging */ + private final DataSet myDataSet; + /** the source dataset where primitives are merged from */ + private final DataSet theirDataSet; + + /** + * A map of all primitives that got replaced with other primitives. + * Key is the primitive id in their dataset, the value is the id in my dataset + */ + 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; + + /** + * constructor + * + * The visitor will merge theirDataSet onto myDataSet + * + * @param myDataSet dataset with my primitives. Must not be null. + * @param theirDataSet dataset with their primitives. Ignored, if null. + * @throws IllegalArgumentException thrown if myDataSet is null + */ + public DataSetMerger(DataSet myDataSet, DataSet theirDataSet) throws IllegalArgumentException { + if (myDataSet == null) + throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null")); + this.myDataSet = myDataSet; + this.theirDataSet = theirDataSet; + conflicts = new ConflictCollection(); + mergedMap = new HashMap(); + fixReferences = new HashSet(); + } + + /** + * Merges a primitive other of type

onto my primitives. + * + * If other.id != 0 it tries to merge it with an corresponding primitive from + * my dataset with the same id. If this is not possible a conflict is remembered + * in {@see #conflicts}. + * + * If other.id == 0 it tries to find a primitive in my dataset with id == 0 which + * is semantically equal. If it finds one it merges its technical attributes onto + * my primitive. + * + * @param

the type of the other primitive + * @param other the other primitive + */ + protected

void mergePrimitive(P other) { + if (!other.isNew() ) { + // try to merge onto a matching primitive with the same + // defined id + // + if (mergeById(other)) + return; + if (!other.isVisible()) + // ignore it + return; + } else { + // try to merge onto a primitive which has no id assigned + // yet but which is equal in its semantic attributes + // + Collection candidates = null; + switch(other.getType()) { + case NODE: candidates = myDataSet.getNodes(); break; + case WAY: candidates =myDataSet.getWays(); break; + case RELATION: candidates = myDataSet.getRelations(); break; + } + for (OsmPrimitive my : candidates) { + if (!my.isNew()) { + continue; + } + 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); + } else { + // copy the technical attributes from other + // version + my.setVisible(other.isVisible()); + my.setUser(other.getUser()); + my.setTimestamp(other.getTimestamp()); + my.setModified(other.isModified()); + fixReferences.add(other.getUniqueId()); + } + return; + } + } + } + + // If we get here we didn't find a suitable primitive in + // my dataset. Create a clone and add it to my dataset. + // + OsmPrimitive my = null; + switch(other.getType()) { + case NODE: my = other.isNew() ? new Node() : new Node(other.getId()); break; + case WAY: my = other.isNew() ? new Way() : new Way(other.getId()); break; + case RELATION: my = other.isNew() ? new Relation() : new Relation(other.getId()); break; + } + my.mergeFrom(other); + myDataSet.addPrimitive(my); + mergedMap.put(other.getUniqueId(), my.getUniqueId()); + fixReferences.add(other.getUniqueId()); + } + + protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) { + Long targetId = mergedMap.get(mergeSource.getUniqueId()); + if (targetId == null) + throw new RuntimeException(tr("Missing merge target for way with id {0}", mergeSource.getUniqueId())); + return myDataSet.getPrimitiveById(targetId, mergeSource.getType()); + } + + protected void fixIncomplete(Way other) { + Way myWay = (Way)getMergeTarget(other); + if (myWay == null) + throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId())); + if (!myWay.incomplete)return; + if (myWay.incomplete && other.getNodesCount() == 0) return; + for (Node n: myWay.getNodes()) { + if (n.incomplete) return; + } + myWay.incomplete = false; + } + + /** + * Postprocess the dataset and fix all merged references to point to the actual + * data. + */ + public void fixReferences() { + for (Way w : theirDataSet.getWays()) { + if (!conflicts.hasConflictForTheir(w) && fixReferences.contains(w.getUniqueId())) { + mergeNodeList(w); + fixIncomplete(w); + } + } + for (Relation r : theirDataSet.getRelations()) { + if (!conflicts.hasConflictForTheir(r) && fixReferences.contains(r.getUniqueId())) { + mergeRelationMembers(r); + } + } + } + + private void mergeNodeList(Way other) { + Way myWay = (Way)getMergeTarget(other); + if (myWay == null) + throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId())); + + List myNodes = new LinkedList(); + for (Node otherNode : other.getNodes()) { + Node myNode = (Node)getMergeTarget(otherNode); + if (myNode != null) { + if (!myNode.isDeleted()) { + myNodes.add(myNode); + } + } else + throw new RuntimeException(tr("Missing merge target for node with id {0}", otherNode.getUniqueId())); + } + + // check whether the node list has changed. If so, set the modified flag on the way + // + if (myWay.getNodes().size() != myNodes.size()) { + myWay.setModified(true); + } else { + for (int i=0; i< myWay.getNodesCount();i++) { + Node n1 = myWay.getNode(i); + Node n2 = myNodes.get(i); + if (n1.isNew() ^ n2.isNew()) { + myWay.setModified(true); + break; + } else if (n1.isNew() && n1 != n2) { + myWay.setModified(true); + break; + } else if (! n1.isNew() && n1.getId() != n2.getId()) { + myWay.setModified(true); + break; + } + } + } + myWay.setNodes(myNodes); + } + + private void mergeRelationMembers(Relation other) { + Relation myRelation = (Relation) getMergeTarget(other); + if (myRelation == null) + throw new RuntimeException(tr("Missing merge target for relation with id {0}", other.getUniqueId())); + LinkedList newMembers = new LinkedList(); + for (RelationMember otherMember : other.getMembers()) { + OsmPrimitive mergedMember = getMergeTarget(otherMember.getMember()); + if (mergedMember == null) + throw new RuntimeException(tr("Missing merge target of type {0} with id {1}", mergedMember.getType(), mergedMember.getUniqueId())); + if (! mergedMember.isDeleted()) { + RelationMember newMember = new RelationMember(otherMember.getRole(), mergedMember); + newMembers.add(newMember); + } + } + + // check whether the list of relation members has changed + // + if (other.getMembersCount() != newMembers.size()) { + myRelation.setModified(true); + } else { + for (int i=0; iother into an existing primitive with the same id. + * + * @param other the other primitive which is to be merged onto a primitive in my primitives + * @return true, if this method was able to merge other with an existing node; false, otherwise + */ + private

boolean mergeById(P other) { + OsmPrimitive my = myDataSet.getPrimitiveById(other.getId(), other.getType()); + // merge other into an existing primitive with the same id, if possible + // + 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; + 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; + } + + /** + * Runs the merge operation. Successfully merged {@see OsmPrimitive}s are in + * {@see #getMyDataSet()}. + * + * See {@see #getConflicts()} for a map of conflicts after the merge operation. + */ + public void merge() { + if (theirDataSet == null) + return; + for (Node node: theirDataSet.getNodes()) { + mergePrimitive(node); + } + for (Way way: theirDataSet.getWays()) { + mergePrimitive(way); + } + for (Relation relation: theirDataSet.getRelations()) { + mergePrimitive(relation); + } + fixReferences(); + } + + /** + * replies my dataset + * + * @return + */ + public DataSet getMyDataSet() { + return myDataSet; + } + + /** + * replies the map of conflicts + * + * @return the map of conflicts + */ + public ConflictCollection getConflicts() { + return conflicts; + } +} Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (revision 2432) +++ (revision ) @@ -1,388 +1,0 @@ -package org.openstreetmap.josm.data.osm.visitor; - -import static org.openstreetmap.josm.tools.I18n.tr; - -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; - -import org.openstreetmap.josm.data.conflict.ConflictCollection; -import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.Way; - -/** - * A visitor that gets a data set at construction time and merges every visited object - * into it. - * - */ -public class MergeVisitor extends AbstractVisitor { - private static Logger logger = Logger.getLogger(MergeVisitor.class.getName()); - - /** the collection of conflicts created during merging */ - private ConflictCollection conflicts; - - /** the target dataset for merging */ - private final DataSet myDataSet; - /** the source dataset where primitives are merged from */ - private final DataSet theirDataSet; - - /** - * A map of all primitives that got replaced with other primitives. - * Key is the primitive id in their dataset, the value is the id in my dataset - */ - 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; - - /** - * constructor - * - * The visitor will merge theirDataSet onto myDataSet - * - * @param myDataSet dataset with my primitives - * @param theirDataSet dataset with their primitives. - */ - public MergeVisitor(DataSet myDataSet, DataSet theirDataSet) { - this.myDataSet = myDataSet; - this.theirDataSet = theirDataSet; - conflicts = new ConflictCollection(); - mergedMap = new HashMap(); - fixReferences = new HashSet(); - } - - /** - * Merges a primitive other of type

onto my primitives. - * - * If other.id != 0 it tries to merge it with an corresponding primitive from - * my dataset with the same id. If this is not possible a conflict is remembered - * in {@see #conflicts}. - * - * If other.id == 0 it tries to find a primitive in my dataset with id == 0 which - * is semantically equal. If it finds one it merges its technical attributes onto - * my primitive. - * - * @param

the type of the other primitive - * @param other the other primitive - */ - protected

void mergePrimitive(P other) { - if (!other.isNew() ) { - // try to merge onto a matching primitive with the same - // defined id - // - if (mergeById(other)) - return; - } else { - // try to merge onto a primitive which has no id assigned - // yet but which is equal in its semantic attributes - // - Collection candidates = null; - switch(other.getType()) { - case NODE: candidates = myDataSet.getNodes(); break; - case WAY: candidates =myDataSet.getWays(); break; - case RELATION: candidates = myDataSet.getRelations(); break; - } - for (OsmPrimitive my : candidates) { - if (!my.isNew()) { - continue; - } - 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); - } else { - // copy the technical attributes from other - // version - my.setVisible(other.isVisible()); - my.setUser(other.getUser()); - my.setTimestamp(other.getTimestamp()); - my.setModified(other.isModified()); - fixReferences.add(other.getUniqueId()); - } - return; - } - } - } - // If we get here we didn't find a suitable primitive in - // my dataset. Create a clone and add it to my dataset. - // - OsmPrimitive my = null; - switch(other.getType()) { - case NODE: my = other.isNew() ? new Node() : new Node(other.getId()); break; - case WAY: my = other.isNew() ? new Way() : new Way(other.getId()); break; - case RELATION: my = other.isNew() ? new Relation() : new Relation(other.getId()); break; - } - my.mergeFrom(other); - myDataSet.addPrimitive(my); - mergedMap.put(other.getUniqueId(), my.getUniqueId()); - fixReferences.add(other.getUniqueId()); - } - - public void visit(Node other) { - mergePrimitive(other); - } - - public void visit(Way other) { - mergePrimitive(other); - } - - public void visit(Relation other) { - mergePrimitive(other); - } - - protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) { - Long targetId = mergedMap.get(mergeSource.getUniqueId()); - if (targetId == null) - throw new RuntimeException(tr("Missing merge target for way with id {0}", mergeSource.getUniqueId())); - return myDataSet.getPrimitiveById(targetId, mergeSource.getType()); - } - - protected void fixIncomplete(Way other) { - Way myWay = (Way)getMergeTarget(other); - if (myWay == null) - throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId())); - if (!myWay.incomplete)return; - if (myWay.incomplete && other.getNodesCount() == 0) return; - for (Node n: myWay.getNodes()) { - if (n.incomplete) return; - } - myWay.incomplete = false; - } - - /** - * Postprocess the dataset and fix all merged references to point to the actual - * data. - */ - public void fixReferences() { - for (Way w : theirDataSet.getWays()) { - if (!conflicts.hasConflictForTheir(w) && fixReferences.contains(w.getUniqueId())) { - mergeNodeList(w); - fixIncomplete(w); - } - } - for (Relation r : theirDataSet.getRelations()) { - if (!conflicts.hasConflictForTheir(r) && fixReferences.contains(r.getUniqueId())) { - mergeRelationMembers(r); - } - } - } - - private void mergeNodeList(Way other) { - Way myWay = (Way)getMergeTarget(other); - if (myWay == null) - throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId())); - - List myNodes = new LinkedList(); - for (Node otherNode : other.getNodes()) { - Node myNode = (Node)getMergeTarget(otherNode); - if (myNode != null) { - if (!myNode.isDeleted()) { - myNodes.add(myNode); - } - } else - throw new RuntimeException(tr("Missing merge target for node with id {0}", otherNode.getUniqueId())); - } - - // check whether the node list has changed. If so, set the modified flag on the way - // - if (myWay.getNodes().size() != myNodes.size()) { - myWay.setModified(true); - } else { - for (int i=0; i< myWay.getNodesCount();i++) { - Node n1 = myWay.getNode(i); - Node n2 = myNodes.get(i); - if (n1.isNew() ^ n2.isNew()) { - myWay.setModified(true); - break; - } else if (n1.isNew() && n1 != n2) { - myWay.setModified(true); - break; - } else if (! n1.isNew() && n1.getId() != n2.getId()) { - myWay.setModified(true); - break; - } - } - } - myWay.setNodes(myNodes); - } - - private void mergeRelationMembers(Relation other) { - Relation myRelation = (Relation) getMergeTarget(other); - if (myRelation == null) - throw new RuntimeException(tr("Missing merge target for relation with id {0}", other.getUniqueId())); - LinkedList newMembers = new LinkedList(); - for (RelationMember otherMember : other.getMembers()) { - OsmPrimitive mergedMember = getMergeTarget(otherMember.getMember()); - if (mergedMember == null) - throw new RuntimeException(tr("Missing merge target of type {0} with id {1}", mergedMember.getType(), mergedMember.getUniqueId())); - if (! mergedMember.isDeleted()) { - RelationMember newMember = new RelationMember(otherMember.getRole(), mergedMember); - newMembers.add(newMember); - } - } - - // check whether the list of relation members has changed - // - if (other.getMembersCount() != newMembers.size()) { - myRelation.setModified(true); - } else { - for (int i=0; iother into an existing primitive with the same id. - * - * @param other the other primitive which is to be merged onto a primitive in my primitives - * @return true, if this method was able to merge other with an existing node; false, otherwise - */ - private

boolean mergeById(P other) { - OsmPrimitive my = myDataSet.getPrimitiveById(other.getId(), other.getType()); - // merge other into an existing primitive with the same id, if possible - // - 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; - 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; - } - - /** - * Runs the merge operation. Successfully merged {@see OsmPrimitive}s are in - * {@see #getMyDataSet()}. - * - * See {@see #getConflicts()} for a map of conflicts after the merge operation. - */ - public void merge() { - for (Node node: theirDataSet.getNodes()) { - node.visit(this); - } - for (Way way: theirDataSet.getWays()) { - way.visit(this); - } - for (Relation relation: theirDataSet.getRelations()) { - relation.visit(this); - } - fixReferences(); - } - - /** - * replies my dataset - * - * @return - */ - public DataSet getMyDataSet() { - return myDataSet; - } - - /** - * replies the map of conflicts - * - * @return the map of conflicts - */ - public ConflictCollection getConflicts() { - return conflicts; - } -} Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 2433) @@ -30,8 +30,8 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.DefaultNameFormatter; import org.openstreetmap.josm.gui.ExceptionDialogUtil; @@ -380,5 +380,5 @@ protected void mergeDataSet(DataSet ds) { if (ds != null) { - final MergeVisitor visitor = new MergeVisitor(getLayer().data, ds); + final DataSetMerger visitor = new DataSetMerger(getLayer().data, ds); visitor.merge(); // FIXME: this is necessary because there are dialogs listening @@ -490,5 +490,5 @@ protected void mergeDataSet(DataSet dataSet) { if (dataSet != null) { - final MergeVisitor visitor = new MergeVisitor(getLayer().data, dataSet); + final DataSetMerger visitor = new DataSetMerger(getLayer().data, dataSet); visitor.merge(); // FIXME: this is necessary because there are dialogs listening Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 2433) @@ -57,9 +57,9 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; import org.openstreetmap.josm.gui.DefaultNameFormatter; @@ -1447,5 +1447,5 @@ if (dataSet != null) { changed = true; - final MergeVisitor visitor = new MergeVisitor(curLayer.data, dataSet); + final DataSetMerger visitor = new DataSetMerger(curLayer.data, dataSet); visitor.merge(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 2433) @@ -14,6 +14,6 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -164,5 +164,5 @@ referrers = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false)); if (referrers != null) { - final MergeVisitor visitor = new MergeVisitor(getLayer().data, referrers); + final DataSetMerger visitor = new DataSetMerger(getLayer().data, referrers); visitor.merge(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 2433) @@ -18,7 +18,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; @@ -136,5 +136,5 @@ return; } - MergeVisitor visitor = new MergeVisitor(Main.main.getEditLayer().data, ds); + DataSetMerger visitor = new DataSetMerger(Main.main.getEditLayer().data, ds); visitor.merge(); if (! visitor.getConflicts().isEmpty()) { Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 2433) @@ -50,4 +50,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DataSource; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -57,5 +58,4 @@ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.data.osm.visitor.MapPaintVisitor; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor; import org.openstreetmap.josm.gui.HelpAwareOptionPane; @@ -277,5 +277,5 @@ */ public void mergeFrom(final DataSet from) { - final MergeVisitor visitor = new MergeVisitor(data,from); + final DataSetMerger visitor = new DataSetMerger(data,from); visitor.merge(); Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 2433) @@ -14,4 +14,5 @@ import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -20,5 +21,4 @@ import org.openstreetmap.josm.data.osm.RelationMember; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; @@ -387,5 +387,5 @@ */ protected void merge(DataSet from) { - final MergeVisitor visitor = new MergeVisitor(outputDataSet,from); + final DataSetMerger visitor = new DataSetMerger(outputDataSet,from); visitor.merge(); } Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 2432) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 2433) @@ -9,9 +9,9 @@ import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.data.osm.visitor.MergeVisitor; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; @@ -227,5 +227,5 @@ OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */); DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false)); - MergeVisitor visitor = new MergeVisitor(ds, wayDs); + DataSetMerger visitor = new DataSetMerger(ds, wayDs); visitor.merge(); } @@ -238,5 +238,5 @@ OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */); DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false)); - MergeVisitor visitor = new MergeVisitor(ds, wayDs); + DataSetMerger visitor = new DataSetMerger(ds, wayDs); visitor.merge(); } @@ -267,10 +267,10 @@ if (primitiveType.equals(OsmPrimitiveType.NODE)) { DataSet ds = getReferringWays(progressMonitor.createSubTaskMonitor(1, false)); - MergeVisitor visitor = new MergeVisitor(ret,ds); + DataSetMerger visitor = new DataSetMerger(ret,ds); visitor.merge(); ret = visitor.getMyDataSet(); } DataSet ds = getReferringRelations(progressMonitor.createSubTaskMonitor(1, false)); - MergeVisitor visitor = new MergeVisitor(ret,ds); + DataSetMerger visitor = new DataSetMerger(ret,ds); visitor.merge(); ret = visitor.getMyDataSet();