386118: [EMF Facet] Papyrus should progressively support EMF Facet 0.2

Adapt to changes in Model Explorer presentation model.

3 files changed, 24 insertions, 18 deletions

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index deb42190269..8dc5652121f 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.0",

  org.eclipse.ui.navigator;bundle-version="3.5.300",

- org.eclipse.emf.cdo.ui.admin;bundle-version="[4.1.200,5.0.0)"

+ org.eclipse.emf.cdo.ui.admin;bundle-version="[4.1.200,5.0.0)",

+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.cdo.internal.ui;x-friends:="org.eclipse.papyrus.cdo.ui.tests,org.eclipse.papyrus.cdo.uml.ui",

  org.eclipse.papyrus.cdo.internal.ui.actions;x-friends:="org.eclipse.papyrus.cdo.ui.tests",

  org.eclipse.papyrus.cdo.internal.ui.adapters;x-friends:="org.eclipse.papyrus.cdo.ui.tests",

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
index 9d1a0dcb6f9..e869b106acc 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 
 <!--
- Copyright (c) 2013 CEA LIST.
+ Copyright (c) 2013, 2014 CEA LIST and others.
  
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0
@@ -11,6 +11,7 @@
  
  Contributors:
    CEA LIST - Initial API and implementation
+   Christian W. Damus (CEA) - bug 386118
  
 -->
 
@@ -117,7 +118,7 @@
                      name="org.eclipse.emf.ecore.EObject">
                </objectClass>
                <objectClass
-                     name="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ITreeElement">
+                     name="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement">
                </objectClass>
             </or>
          </enablement>
@@ -310,7 +311,7 @@
          </adapter>
       </factory>
       <factory
-            adaptableType="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ITreeElement"
+            adaptableType="org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement"
             class="org.eclipse.papyrus.cdo.internal.ui.adapters.CDOAdapterFactory">
          <adapter
                type="org.eclipse.emf.cdo.CDOObject">
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
index 5ea1b6fe245..37f8b0c6f76 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/src/org/eclipse/papyrus/cdo/internal/ui/adapters/CDOAdapterFactory.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
+ * Copyright (c) 2013, 2014 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
+ *   Christian W. Damus (CEA) - bug 386118
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.internal.ui.adapters;
 
@@ -18,37 +20,38 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
+import org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
 
 /**
  * This is the CDOAdapterFactory type. Enjoy.
  */
 @SuppressWarnings("rawtypes")
-public class CDOAdapterFactory
-		implements IAdapterFactory {
+public class CDOAdapterFactory implements IAdapterFactory {
 
-	private final Class[] supported = {CDOObject.class};
+	private final Class[] supported = { CDOObject.class };
 
 	public CDOAdapterFactory() {
 		super();
 	}
 
+	@Override
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		EObject eObject = null;
-		if (adaptableObject instanceof EditPart) {
+		if(adaptableObject instanceof EditPart) {
 			// notation views are important as CDOObjects for locking and
 			// conflict purposes, so do not defer to the semantic element
-			eObject = (EObject) ((EditPart) adaptableObject).getModel();
-		} else if (adaptableObject instanceof EObject) {
-			eObject = (EObject) adaptableObject;
+			eObject = (EObject)((EditPart)adaptableObject).getModel();
+		} else if(adaptableObject instanceof EObjectTreeElement) {
+			eObject = ((EObjectTreeElement)adaptableObject).getEObject();
+		} else if(adaptableObject instanceof EObject) {
+			eObject = (EObject)adaptableObject;
 		} else {
 			// try really hard to get an EObject
-			if (adaptableObject instanceof IAdaptable) {
-				eObject = (EObject) ((IAdaptable) adaptableObject)
-					.getAdapter(EObject.class);
+			if(adaptableObject instanceof IAdaptable) {
+				eObject = (EObject)((IAdaptable)adaptableObject).getAdapter(EObject.class);
 			}
-			if (eObject == null) {
-				eObject = (EObject) Platform.getAdapterManager()
-					.getAdapter(adaptableObject, EObject.class);
+			if(eObject == null) {
+				eObject = (EObject)Platform.getAdapterManager().getAdapter(adaptableObject, EObject.class);
 			}
 		}
 
@@ -56,6 +59,7 @@ public class CDOAdapterFactory
 		return CDOUtils.getCDOObject(eObject);
 	}
 
+	@Override
 	public Class[] getAdapterList() {
 		return supported;
 	}