From 991616abba4978a03dbcb8d33f89ac851b8ad405 Mon Sep 17 00:00:00 2001
From: Benoit Maggi
Date: Thu, 27 Apr 2017 16:34:49 +0200
Subject: Bug 515235 - [Architecture Framework] Palette Configuration shall be
 have a better integration to AF

 - add a property palettes in Meta model
 - remove old customePalette in Meta model
 - the palette application filter should be done with the name of the
PapyrusDiagram defined in the architecture (currently the key, hopfully
will be changed for an id field)

Change-Id: I7a4163874bbb94f92bd76043d956ee8e79b4a6bb---
 .../model/GmfDiagRepresentation.ecore                                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore')

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
index db0a46e3490..f4b3792e410 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
@@ -3,7 +3,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="representation" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
     nsPrefix="gmfdiagrepresentation">
   <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagram" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//PapyrusRepresentationKind">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customPalette" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="customStyle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="childRules" upperBound="-1"
         eType="#//ChildRule" containment="true">
@@ -28,6 +27,8 @@
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="palettes" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore#//PaletteConfiguration"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ChildRule" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//Rule">
     <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-- 
cgit v1.2.3