Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-06-01 19:18:42 +0000
committerFlorian Noyrit2017-06-06 15:05:32 +0000
commit17f500ad54d8dc9362b31a737ec19cd24627f297 (patch)
tree7afbc1ea66c80c935f0080f283f784ed99cc3720 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model
parent273dd997e6462e2e1709e72dadb311460a60725c (diff)
downloadorg.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.tar.gz
org.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.tar.xz
org.eclipse.papyrus-17f500ad54d8dc9362b31a737ec19cd24627f297.zip
Bug 516901 - Replaced references to Architecture model elements by their
unique ids instead. This will avoid such elements being loaded in user model resource sets. Also, refactored the Architecture metamodel by moving the id and icon attributes to ADElement so that all elements in the model have them. This also include refactoring of the uml.architecture model to give ids to various diagrams and tables. Also, changed the UMLDiagramReconciler_1_3 to put the diagramKindId attribute instead of the diagramKind reference in the PapyrusDiagramStyle. Also, change the UMLTableReconciler_1_3 to a) test the proxy URI of the old prototype instead of name (since the legacy viewpoint configuration models were deleted earlier resulting in proxies) and to set the tableKindId instead of changing the prototype (which is now deprecated). Change-Id: I99413c1dd6daeaf395fc8c70b8b7ed2e0573acd1 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model')
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore2
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore
index f20f25e6f98..d088fee1ed0 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.ecore
@@ -4,6 +4,6 @@
nsPrefix="style">
<eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagramStyle" eSuperTypes="../../org.eclipse.gmf.runtime.notation/model/notation.ecore#//Style">
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="diagramKind" eType="ecore:EClass ../../org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore#//PapyrusDiagram"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramKindId" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel
index b5f0eb7d0f9..4ac78987fb6 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model/style.genmodel
@@ -8,14 +8,14 @@
nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.style.tests/src-gen" testSuiteClass="org.eclipse.papyrus.infra.gmfdiag.style.tests.StyleAllTests"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
- language="" usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation ../../org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel#//representation"
+ language="" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation"
operationReflection="true" importOrganizing="true">
<foreignModel>style.ecore</foreignModel>
<genPackages prefix="Style" basePackage="org.eclipse.papyrus.infra.gmfdiag" disposableProviderFactory="true"
ecorePackage="style.ecore#/">
<genClasses ecoreClass="style.ecore#//PapyrusDiagramStyle">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference style.ecore#//PapyrusDiagramStyle/owner"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference style.ecore#//PapyrusDiagramStyle/diagramKind"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute style.ecore#//PapyrusDiagramStyle/diagramKindId"/>
</genClasses>
</genPackages>
</genmodel:GenModel>

Back to the top