[308232] [Dawn] Develop collaborative support for GMF on CDO

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

2 files changed, 37 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnDiagramUpdater.java
index 63a2e6382e..bd5b608256 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnDiagramUpdater.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/DawnDiagramUpdater.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
@@ -208,6 +209,31 @@ public class DawnDiagramUpdater
     return null;
   }
 
+  public static View getViewFromObject(EObject element, DiagramDocumentEditor editor)
+  {
+    View view;
+
+    if (element instanceof Diagram)
+    {
+      view = ViewUtil.getViewContainer(element);
+      return view;
+    }
+
+    if (element instanceof View)
+    {
+      view = (View)element;
+    }
+    else
+    {
+      view = DawnDiagramUpdater.findViewByContainer(element); // something which is not view (Edge or Node)
+      if (view == null)
+      {
+        view = DawnDiagramUpdater.findViewForModel(element, editor);
+      }
+    }
+    return view;
+  }
+
   public static EditPart createOrFindEditPartIfViewExists(View view, DiagramDocumentEditor editor)
   {
     EditPart editPart = findEditPart(view, editor.getDiagramEditPart());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
index c167458c31..5249e8b886 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java
@@ -72,7 +72,7 @@ public class CDOConnectionUtil
     this.repositoryName = repositoryName;
     this.protocol = protocol;
     this.host = host;
-    connector = (IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", protocol, host);
+    setConnector((IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", protocol, host));
   }
 
   public void registerPackages(List<EPackage> packages)
@@ -188,4 +188,14 @@ public class CDOConnectionUtil
     }
     return transaction;
   }
+
+  public void setConnector(IConnector connector)
+  {
+    this.connector = connector;
+  }
+
+  public IConnector getConnector()
+  {
+    return connector;
+  }
 }