Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java14
1 files changed, 0 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java
index 234b7fff6..84d1bcdc5 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java
@@ -15,16 +15,12 @@ import static com.google.common.collect.Lists.newArrayList;
import com.google.common.base.Preconditions;
-import java.util.Collection;
import java.util.List;
-import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.domain.IMergeRunnable;
import org.eclipse.emf.compare.internal.merge.MergeMode;
import org.eclipse.emf.compare.internal.merge.MergeOperation;
-import org.eclipse.emf.compare.merge.BatchMerger;
-import org.eclipse.emf.compare.merge.IBatchMerger;
import org.eclipse.emf.compare.merge.IDiffRelationshipComputer;
import org.eclipse.emf.compare.merge.IMerger.Registry;
@@ -70,14 +66,4 @@ public final class MergeRunnableImpl extends AbstractMergeRunnable implements IM
throw new IllegalStateException();
}
}
-
- private void mergeAll(Collection<? extends Diff> differences, boolean leftToRight,
- Registry mergerRegistry) {
- final IBatchMerger merger = new BatchMerger(getDiffRelationshipComputer(mergerRegistry));
- if (leftToRight) {
- merger.copyAllLeftToRight(differences, new BasicMonitor());
- } else {
- merger.copyAllRightToLeft(differences, new BasicMonitor());
- }
- }
}

Back to the top