Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-03-24 13:57:14 +0000
committerFlorian Noyrit2017-03-24 14:23:43 +0000
commitbed34aa30cdedbba9d0360f6e66af7c7a3010620 (patch)
treecd0b38dcccd4760896b4d440b7e286957ff2abdb /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/model
parent172c9b0b63ba3be2c93ff710a8b7b4d288db633e (diff)
downloadorg.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.tar.gz
org.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.tar.xz
org.eclipse.papyrus-bed34aa30cdedbba9d0360f6e66af7c7a3010620.zip
Bug 510451 - multiple fixes in architecture framework support
- Fix a typo in the name of the property ADElement::description - Fixed failing test cases - Enabled NLS markers in architecture framework genmodels - Changed the order of the switch architecture context menu actions - Removed confusing log message about elementtypeset registerd but not bound - Fixed new model wizard load template combo box - Fix AF API working when layout is saved locally Change-Id: Ifb509afcdffca348cd028094e181677b8f6d9ee4 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.genmodel11
2 files changed, 7 insertions, 6 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 d01f3e9ca29..f20f25e6f98 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/Representation.ecore#//PapyrusDiagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagramKind" eType="ecore:EClass ../../org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore#//PapyrusDiagram"/>
</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 6aadfc98292..b5f0eb7d0f9 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
@@ -5,13 +5,14 @@
editorDirectory="/org.eclipse.papyrus.infra.gmfdiag.style.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.gmfdiag.style"
modelName="Style" editPluginClass="org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin"
editorPluginClass="org.eclipse.papyrus.infra.gmfdiag.style.presentation.StyleEditorPlugin"
- 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/Representation.genmodel#//representation"
+ 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"
operationReflection="true" importOrganizing="true">
<foreignModel>style.ecore</foreignModel>
- <genPackages prefix="Style" basePackage="org.eclipse.papyrus.infra.gmfdiag" resource="XMI"
- disposableProviderFactory="true" ecorePackage="style.ecore#/">
+ <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"/>

Back to the top