[467442] Add Interactive Transaction Conflict Resolution

https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442

1 files changed, 8 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutEditorOpenerRegistry.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutEditorOpenerRegistry.java
index 9b7c14ba93..1ba75653d7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutEditorOpenerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutEditorOpenerRegistry.java
@@ -13,18 +13,20 @@ package org.eclipse.emf.cdo.explorer.ui.checkouts;
 import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
 import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
 import org.eclipse.emf.cdo.explorer.ui.bundle.OM;
+import org.eclipse.emf.cdo.internal.ui.InteractiveConflictHandlerSelector;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.ui.CDOEditorUtil;
 import org.eclipse.emf.cdo.util.CDOURIUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.emf.internal.cdo.transaction.CDOHandlingConflictResolver;
+
 import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.WrappedException;
 import org.eclipse.net4j.util.container.Container;
 import org.eclipse.net4j.util.om.OMPlatform;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.spi.cdo.CDOMergingConflictResolver;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
@@ -50,6 +52,7 @@ import java.util.Map;
 /**
  * @author Eike Stepper
  */
+@SuppressWarnings("restriction")
 public class CDOCheckoutEditorOpenerRegistry extends Container<CDOCheckoutEditorOpener>
 {
   public static final CDOCheckoutEditorOpenerRegistry INSTANCE = new CDOCheckoutEditorOpenerRegistry();
@@ -223,8 +226,11 @@ public class CDOCheckoutEditorOpenerRegistry extends Container<CDOCheckoutEditor
 
       if (view instanceof CDOTransaction)
       {
+        CDOHandlingConflictResolver conflictResolver = new CDOHandlingConflictResolver();
+        conflictResolver.setConflictHandlerSelector(new InteractiveConflictHandlerSelector());
+
         CDOTransaction transaction = (CDOTransaction)view;
-        transaction.options().addConflictResolver(new CDOMergingConflictResolver());
+        transaction.options().addConflictResolver(conflictResolver);
       }
 
       final IEditorPart editor = openEditor(page, view, CDOURIUtil.extractResourcePath(uri));