diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/merge/CompareDiagramMerger.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/merge/CompareDiagramMerger.java | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/merge/CompareDiagramMerger.java b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/merge/CompareDiagramMerger.java new file mode 100644 index 000000000..ac966807a --- /dev/null +++ b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/merge/CompareDiagramMerger.java @@ -0,0 +1,124 @@ +/*******************************************************************************
+ * Copyright (c) 2012, 2013 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.diagram.internal.merge;
+
+import org.eclipse.emf.common.util.Monitor;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.DifferenceSource;
+import org.eclipse.emf.compare.DifferenceState;
+import org.eclipse.emf.compare.diagram.internal.extensions.DiagramDiff;
+import org.eclipse.emf.compare.merge.AbstractMerger;
+
+/**
+ * Specific implementation of {@link AbstractMerger} for Diagram differences.
+ *
+ * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ */
+public class CompareDiagramMerger extends AbstractMerger {
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.merge.IMerger#isMergerFor(org.eclipse.emf.compare.Diff)
+ */
+ public boolean isMergerFor(Diff target) {
+ return target instanceof DiagramDiff;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.merge.IMerger#copyLeftToRight(org.eclipse.emf.compare.Diff,
+ * org.eclipse.emf.common.util.Monitor)
+ */
+ public void copyLeftToRight(Diff target, Monitor monitor) {
+ // Don't merge an already merged (or discarded) diff
+ if (target.getState() != DifferenceState.UNRESOLVED) {
+ return;
+ }
+ final DiagramDiff diff = (DiagramDiff)target;
+
+ setEquivalentDiffAsMerged(diff);
+
+ // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles.
+ diff.setState(DifferenceState.MERGED);
+ final Diff semanticDiff = diff.getSemanticDiff();
+ if (semanticDiff != null) {
+ for (Diff semanticRefines : semanticDiff.getRefines()) {
+ mergeDiff(semanticRefines, false, monitor);
+ }
+ mergeDiff(semanticDiff, false, monitor);
+ }
+
+ if (diff.getSource() == DifferenceSource.LEFT) {
+ // merge all "requires" diffs
+ mergeRequires(diff, false, monitor);
+ } else {
+ // merge all "required by" diffs
+ mergeRequiredBy(diff, false, monitor);
+ }
+
+ for (Diff refining : diff.getRefinedBy()) {
+ mergeDiff(refining, false, monitor);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.merge.IMerger#copyRightToLeft(org.eclipse.emf.compare.Diff,
+ * org.eclipse.emf.common.util.Monitor)
+ */
+ public void copyRightToLeft(Diff target, Monitor monitor) {
+ // Don't merge an already merged (or discarded) diff
+ if (target.getState() != DifferenceState.UNRESOLVED) {
+ return;
+ }
+ final DiagramDiff diff = (DiagramDiff)target;
+
+ setEquivalentDiffAsMerged(diff);
+
+ // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles.
+ diff.setState(DifferenceState.MERGED);
+ final Diff semanticDiff = diff.getSemanticDiff();
+ if (semanticDiff != null) {
+ for (Diff semanticRefines : semanticDiff.getRefines()) {
+ mergeDiff(semanticRefines, true, monitor);
+ }
+ mergeDiff(semanticDiff, true, monitor);
+ }
+
+ if (diff.getSource() == DifferenceSource.LEFT) {
+ // merge all "required by" diffs
+ mergeRequiredBy(diff, true, monitor);
+ } else {
+ mergeRequires(diff, true, monitor);
+ }
+
+ for (Diff refining : diff.getRefinedBy()) {
+ mergeDiff(refining, true, monitor);
+ }
+ }
+
+ /**
+ * Iterates over the differences equivalent to {@code diff} and sets them as
+ * {@link DifferenceState#MERGED}.
+ *
+ * @param diff
+ * Diff which equivalences are to be considered merged.
+ */
+ private void setEquivalentDiffAsMerged(DiagramDiff diff) {
+ if (diff.getEquivalence() != null) {
+ for (Diff equivalent : diff.getEquivalence().getDifferences()) {
+ equivalent.setState(DifferenceState.MERGED);
+ }
+ }
+ }
+}
|