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

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

5 files changed, 48 insertions, 9 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom
new file mode 100644
index 00000000000..d5c27d5173d
--- /dev/null
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="PaletteConfiguration">

+  <eClassifiers xsi:type="custom:EClassCustomization" name="PaletteConfiguration" documentation="PaletteConfiguration">

+    <extendedMetaclass href="platform:/plugins/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore#//PaletteConfiguration"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="custom:EClassCustomization" name="DrawerConfiguration" documentation="DrawerConfiguration">

+    <extendedMetaclass href="platform:/plugins/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore#//DrawerConfiguration"/>

+    <facetOperations name="getDrawerLabel" documentation="Returns the label for a drawer">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

+      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetDrawerLabelQuery"/>

+    </facetOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="custom:EClassCustomization" name="Configuration" documentation="Configuration">

+    <extendedMetaclass href="platform:/plugins/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore#//Configuration"/>

+    <facetOperations name="hasIcon" lowerBound="1" documentation="Returns true if the element has a specific icon to display">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

+      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.HasIconQuery"/>

+    </facetOperations>

+    <facetOperations name="getIcon" lowerBound="1" documentation="Gets the icon for a configuration element in the palette configuration model">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

+      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetIconQuery"/>

+    </facetOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="custom:EClassCustomization" name="ToolConfiguration" documentation="ToolConfiguration">

+    <extendedMetaclass href="platform:/plugins/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore#//ToolConfiguration"/>

+    <facetOperations name="getToolLabel" lowerBound="1" documentation="Returns the Label for a tool.">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

+      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetToolLabelQuery"/>

+    </facetOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="custom:EClassCustomization" name="StackConfiguration" instanceClassName="" documentation="StackConfiguration">

+    <extendedMetaclass href="platform:/plugins/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore#//StackConfiguration"/>

+  </eClassifiers>

+</custom:Customization>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java
index c742198472d..439fc7e3c19 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/preview/Preview.java
@@ -31,7 +31,8 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ITreeElement;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

@@ -435,8 +436,8 @@ public class Preview extends ViewPart implements ISelectionChangedListener, IPar
 	public void selectionChanged(SelectionChangedEvent event) {

 		IStructuredSelection selection = (IStructuredSelection)event.getSelection();

 		if(selection.size() == 1) {

-			ITreeElement child = null;

-			ITreeElement element = (ITreeElement)selection.getFirstElement();

+			EObjectTreeElement child = null;

+			EObjectTreeElement element = (EObjectTreeElement)selection.getFirstElement();

 

 			do {

 

@@ -449,7 +450,10 @@ public class Preview extends ViewPart implements ISelectionChangedListener, IPar
 				}

 

 				child = element;

-				element = element.getTreeParent();

+				EStructuralFeatureTreeElement elementFeature = element.getParent();

+				if( elementFeature.getParent()!=null){

+					element=elementFeature.getParent();

+				}

 			} while(child != element && element != null);

 		}

 	}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java
index f7832c1e141..49222748076 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/GenericAttributeModelElement.java
@@ -22,15 +22,17 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.facet.infra.query.ModelQuery;

+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.infra.constraints.ConfigProperty;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

+import org.eclipse.papyrus.views.properties.ui.WidgetAttribute;

 

 /**

  * XWT relies a lot on reflectivity, as it is based on an XML syntax.

@@ -114,7 +116,7 @@ public class GenericAttributeModelElement extends AbstractModelElement {
 				Iterator<EObject> iterator = result.iterator();

 				while(iterator.hasNext()) {

 					EObject eObject = iterator.next();

-					if(!(eObject instanceof ModelQuery)) {

+					if(!(eObject instanceof Query)) {

 						iterator.remove();

 					}

 				}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java
index 7509d753907..06a16fa8232 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextContentProvider.java
@@ -18,8 +18,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.emf.facet.custom.core.ICustomizationManager;

 import org.eclipse.emf.facet.custom.ui.internal.CustomizedTreeContentProvider;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

 import org.eclipse.papyrus.customization.properties.Activator;

 import org.eclipse.papyrus.views.properties.contexts.Context;

 import org.eclipse.papyrus.views.properties.util.PropertiesUtil;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java
index e27a7e883a0..e00e12a8e3e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/ContextLabelProvider.java
@@ -16,6 +16,7 @@ import java.lang.reflect.Method;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.facet.custom.core.ICustomizationManager;

+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;

 import org.eclipse.emf.facet.custom.ui.internal.CustomizedLabelProvider;

 import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider;

 import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

@@ -44,7 +45,7 @@ public class ContextLabelProvider extends CustomizedLabelProvider {
 

 	@Override

 	public String getText(Object element) {

-		if(!(element instanceof ITreeElement) && element instanceof EObject) {

+		if(!(element instanceof EObjectTreeElement) && element instanceof EObject) {

 			try {

 				Method method = CustomizationManager.class.getDeclaredMethod("getAppearanceConfiguration");//$NON-NLS-1$

 				method.setAccessible(true);