[EMF Facet] Papyrus should progressively support EMF Facet 0.2

1 files changed, 62 insertions, 15 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom
index 2dead5fd99f..a737d8541cf 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom
@@ -1,23 +1,70 @@
 <?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:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="org.eclipse.emf.facet.efacet.examples.library.core.custom">

-  <eClassifiers xsi:type="custom:EClassCustomization" name="Diagram" documentation="Representation of diagram in model explorer">

-    <extendedMetaclass href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

-    <facetOperations name="GetDiagramIcon" documentation="Return the path to the icon of the corresponding diagram">

-      <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.infra.gmfdiag.modelexplorer.queries.GetDiagramIcon"/>

+<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/papyrus/emf/facet/custom/0.2.incubation/custom"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"

+    xmlns:javaQuery="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"

+    xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"

+    name="PapyrusNotation">

+  <eClassifiers

+      xsi:type="custom:EClassCustomization"

+      name="Diagram"

+      documentation="Representation of diagram in model explorer">

+    <extendedMetaclass

+        href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

+    <facetOperations

+        name="GetDiagramIcon"

+        documentation="Return the path to the icon of the corresponding diagram">

+      <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.infra.gmfdiag.modelexplorer.queries.GetDiagramIcon"/>

     </facetOperations>

   </eClassifiers>

-  <eClassifiers xsi:type="custom:EClassCustomization" name="EObject" documentation="representation around EObject displayed in model explorer">

-    <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <facetElements xsi:type="efacet:FacetReference" name="diagrams" upperBound="-1" defaultValueLiteral="" override="//EObject/GetContainedDiagrams">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

+  <eClassifiers

+      xsi:type="custom:EClassCustomization"

+      name="EObject"

+      documentation="representation around EObject displayed in model explorer">

+    <extendedMetaclass

+        href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <facetElements

+        xsi:type="efacet:FacetReference"

+        name="diagrams"

+        upperBound="-1"

+        defaultValueLiteral=""

+        derived="true">

+      <eType

+          xsi:type="ecore:EClass"

+          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

+      <query

+          xsi:type="query:OperationCallQuery"

+          operation="//EObject/GetContainedDiagrams"/>

     </facetElements>

-    <facetOperations name="IsDiagramContainer" documentation="Return true if the element contains diagrams">

-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.IsDiagramContainer"/>

+    <facetOperations

+        name="IsDiagramContainer"

+        documentation="Return true if the element contains diagrams">

+      <eType

+          xsi:type="ecore:EDataType"

+          href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+      <query

+          xsi:type="javaQuery:JavaQuery"

+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.IsDiagramContainer"/>

     </facetOperations>

-    <facetOperations name="GetContainedDiagrams" upperBound="-1" documentation="Get the collection of all contained diagrams">

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetContainedDiagrams"/>

+    <facetOperations

+        name="GetContainedDiagrams"

+        upperBound="-1"

+        documentation="Get the collection of all contained diagrams">

+      <eType

+          xsi:type="ecore:EClass"

+          href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>

+      <query

+          xsi:type="javaQuery:JavaQuery"

+          implementationClassName="org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries.GetContainedDiagrams"/>

     </facetOperations>

   </eClassifiers>

 </custom:Customization>