diff options
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.java | 7 |
1 files changed, 4 insertions, 3 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 0a3fc516a..46b70d23c 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 @@ -74,7 +74,8 @@ public final class MergeRunnableImpl extends AbstractMergeRunnable implements IM } } - private void mergeAll(Collection<? extends Diff> differences, boolean leftToRight, Registry mergerRegistry) { + private void mergeAll(Collection<? extends Diff> differences, boolean leftToRight, + Registry mergerRegistry) { final IBatchMerger merger = new BatchMerger(mergerRegistry); if (leftToRight) { merger.copyAllLeftToRight(differences, new BasicMonitor()); @@ -89,8 +90,8 @@ public final class MergeRunnableImpl extends AbstractMergeRunnable implements IM mergerRegistry, !leftToRight); addOrUpdateMergeData(resultingMerges, getMergeMode()); - final Set<Diff> resultingRejections = MergeDependenciesUtil.getAllResultingRejections( - difference, mergerRegistry, !leftToRight); + final Set<Diff> resultingRejections = MergeDependenciesUtil + .getAllResultingRejections(difference, mergerRegistry, !leftToRight); if (getMergeMode() == MergeMode.LEFT_TO_RIGHT || getMergeMode() == MergeMode.RIGHT_TO_LEFT) { addOrUpdateMergeData(resultingRejections, getMergeMode()); } else { |