diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java index c22a8fda2..0ca25b5c5 100644 --- a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java +++ b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java @@ -188,7 +188,7 @@ public class RecursiveModelMerger extends RecursiveMerger { try { // We need to refresh because new resources may have been added refreshRoots(subscriber.roots()); - modelMerger = LogicalModels.findAdapter(logicalModel, IResourceMappingMerger.class); + modelMerger = getResourceMappingMerger(logicalModel); } catch (CoreException e) { Activator.logError(MergeText.RecursiveModelMerger_AdaptError, e); // ignore this model and fall back to default @@ -241,6 +241,11 @@ public class RecursiveModelMerger extends RecursiveMerger { return true; } + protected IResourceMappingMerger getResourceMappingMerger(Set<IResource> logicalModel) + throws CoreException { + return LogicalModels.findAdapter(logicalModel, IResourceMappingMerger.class); + } + private boolean fallBackToDefaultMerge(TreeWalk treeWalk, boolean ignoreConflicts) throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException, IOException { boolean hasWorkingTreeIterator = tw.getTreeCount() > T_FILE; |