Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2011-09-08 05:51:43 -0400
committervlorenzo2011-09-08 05:51:43 -0400
commit7119eb3634c5132e2707b9e082a205dcebb15f21 (patch)
treed7960979bac8d108f81fadf0c541d65e27d3d406 /plugins/sysml/org.eclipse.papyrus.sysml.facets/resources
parentc75bd29b2a6590acf9703adf47e83d02b36a853e (diff)
downloadorg.eclipse.papyrus-7119eb3634c5132e2707b9e082a205dcebb15f21.tar.gz
org.eclipse.papyrus-7119eb3634c5132e2707b9e082a205dcebb15f21.tar.xz
org.eclipse.papyrus-7119eb3634c5132e2707b9e082a205dcebb15f21.zip
Merged Branch 0.8.X changes 5111::5401 for oep.sysml.facets
NEW - bug 357049: [Table Editor][SysM] Direction for Facet FlowPort is not correctly displayed https://bugs.eclipse.org/bugs/show_bug.cgi?id=357049
Diffstat (limited to 'plugins/sysml/org.eclipse.papyrus.sysml.facets/resources')
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel20
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore12
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet4
4 files changed, 35 insertions, 3 deletions
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel
new file mode 100644
index 00000000000..ba39a559190
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.sysml.facets_branch/src"
+ modelPluginID="org.eclipse.papyrus.sysml.facets_branch" modelName="Extendedsysml"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false">
+ <foreignModel>extentedsysml.ecore</foreignModel>
+ <genPackages prefix="Extendedsysml" basePackage="org.eclipse.papyrus.sysml.facets.extendedsysml"
+ disposableProviderFactory="true" ecorePackage="extentedsysml.ecore#/">
+ <nestedGenPackages prefix="Portandflows" disposableProviderFactory="true" ecorePackage="extentedsysml.ecore#//portandflows">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="extentedsysml.ecore#//portandflows/FlowPortDirection">
+ <genEnumLiterals ecoreEnumLiteral="extentedsysml.ecore#//portandflows/FlowPortDirection/in"/>
+ <genEnumLiterals ecoreEnumLiteral="extentedsysml.ecore#//portandflows/FlowPortDirection/out"/>
+ <genEnumLiterals ecoreEnumLiteral="extentedsysml.ecore#//portandflows/FlowPortDirection/inout"/>
+ </genEnums>
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="extentedsysml.ecore#//portandflows/NAFlowPortDirection">
+ <genEnumLiterals ecoreEnumLiteral="extentedsysml.ecore#//portandflows/NAFlowPortDirection/NA"/>
+ </genEnums>
+ </nestedGenPackages>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore
new file mode 100644
index 00000000000..154a23ae23d
--- /dev/null
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="extendedsysml"
+ nsURI="http://www.eclipse.org/papyrus/0.8.0/ExtendedSysML" nsPrefix="ExtendedSysml">
+ <eSubpackages name="portandflows" nsURI="http://www.eclipse.org/papyrus/0.7.0/ExtendedSysML/PortAndFlows"
+ nsPrefix="PortAndFlows">
+ <eClassifiers xsi:type="ecore:EEnum" name="NAFlowPortDirection" instanceTypeName="NAFlowPortDirection">
+ <eLiterals name="NA" literal="N/A"/>
+ </eClassifiers>
+ </eSubpackages>
+</ecore:EPackage>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
index 2c84994c523..4a1595523df 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
@@ -7,7 +7,7 @@
<valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/portAndFlowsQueries#GetFlowPortIsAtomicQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetAttribute" name="direction" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows/FlowDirection"/>
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
<valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/portAndFlowsQueries#GetFlowPortDirectionQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/portAndFlowsQueries#SetFlowPortDirectionQuery"/>
</eStructuralFeatures>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
index 703f5dc4188..7c1fedbeb5c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
@@ -8,11 +8,11 @@
<scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetFlowPortDirectionQuery" description="Query to qet the attribute &quot;Direction&quot; of the FlowPort" implementationClassName="org.eclipse.papyrus.sysml.facets.portandflows.query.value.getter.GetFlowPortDirectionQuery">
- <returnType xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows/FlowDirection"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
<scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetFlowPortDirectionQuery" description="Query to qet the attribute &quot;Direction&quot; of the FlowPort" implementationClassName="org.eclipse.papyrus.sysml.facets.portandflows.query.value.setter.SetFlowPortDirectionQuery">
- <returnType xsi:type="ecore:EEnum" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows/FlowDirection"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
<scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
</queries>
</query:ModelQuerySet>

Back to the top