Skip to content

Commit 36a731a

Browse files
seidewitzseidewitz
committed
ST6RI-8 Added local types.ecore to support QVT.
1 parent 946d822 commit 36a731a

28 files changed

Lines changed: 1164 additions & 346 deletions

‎org.omg.sysml.ide/xtend-gen/org/omg/sysml/ide/.AlfIdeSetup.xtendbin‎

0 Bytes
Binary file not shown.

‎org.omg.sysml/.launch/Launch Runtime Alf SysML.launch‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎org.omg.sysml/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
33
<mapping sourceURI="http://www.omg.org/spec/SysML/2.0" targetURI="platform:/resource/org.omg.sysml/model/SysML.ecore"/>
4+
<mapping sourceURI="http://www.eclipse.org/uml2/5.0.0/Types" targetURI="platform:/resource/org.omg.sysml/model/types.ecore"/>
45
</uriMap:MappingContainer>

‎org.omg.sysml/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.xtext,
1616
org.antlr.runtime,
1717
org.eclipse.core.runtime,
1818
org.eclipse.emf.ecore;visibility:=reexport,
19-
org.eclipse.uml2.types;visibility:=reexport,
2019
org.eclipse.uml2.common;visibility:=reexport,
2120
org.eclipse.ocl.ecore;visibility:=reexport,
2221
org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
@@ -35,7 +34,9 @@ Export-Package: org.omg.sysml,
3534
org.omg.sysml.validation,
3635
org.omg.sysml.lang.sysml,
3736
org.omg.sysml.lang.sysml.impl,
38-
org.omg.sysml.lang.sysml.util
37+
org.omg.sysml.lang.sysml.util,
38+
org.omg.sysml.lang.types.types,
39+
org.omg.sysml.lang.types.types.impl
3940
Import-Package: com.ibm.icu.impl.text;version="58.2.0",
4041
org.apache.commons.logging,
4142
org.apache.log4j

‎org.omg.sysml/model/SysML.ecore‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@
5858
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" ordered="false"
5959
eType="#//Element" eOpposite="#//Element/ownedElement"/>
6060
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" ordered="false"
61-
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
62-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
61+
eType="ecore:EDataType types.ecore#//String"/>
62+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" eType="ecore:EDataType types.ecore#//String"/>
6363
</eClassifiers>
6464
<eClassifiers xsi:type="ecore:EClass" name="Membership" eSuperTypes="#//Relationship">
65-
<eOperations name="isDistinguishableFrom" ordered="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean">
65+
<eOperations name="isDistinguishableFrom" ordered="false" lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean">
6666
<eParameters name="other" ordered="false" lowerBound="1" eType="#//Membership"/>
6767
</eOperations>
6868
<eStructuralFeatures xsi:type="ecore:EAttribute" name="memberName" ordered="false"
69-
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
69+
eType="ecore:EDataType types.ecore#//String"/>
7070
<eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false"
7171
lowerBound="1" eType="#//VisibilityKind" defaultValueLiteral="public"/>
7272
<eStructuralFeatures xsi:type="ecore:EAttribute" name="aliases" ordered="false"
73-
upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
73+
upperBound="-1" eType="ecore:EDataType types.ecore#//String"/>
7474
<eStructuralFeatures xsi:type="ecore:EReference" name="memberElement" ordered="false"
7575
lowerBound="1" eType="#//Element">
7676
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
@@ -95,7 +95,7 @@
9595
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
9696
<details key="documentation" value="membership->isUnique(name)&#xA;membership->forAll(m1 | membership->forAll(m2 | m1 &lt;> m2 implies m1.isDistinguishableFrom(m2)))&#xA;member = membership.memberElement&#xA;ownedMember = ownedMembership.ownedMemberElement&#xA;importedMembership = excludeCollisions(ownedImport.importedMembership())->select(m1 | ownedMembership->forAll(m2 | m1.isDistinguishableFrom(m2)))"/>
9797
</eAnnotations>
98-
<eOperations name="nameOf" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String">
98+
<eOperations name="nameOf" ordered="false" eType="ecore:EDataType types.ecore#//String">
9999
<eParameters name="element" ordered="false" lowerBound="1" eType="#//Element"/>
100100
</eOperations>
101101
<eOperations name="excludeCollisions" ordered="false" lowerBound="1" upperBound="-1"
@@ -205,7 +205,7 @@
205205
</eAnnotations>
206206
</eStructuralFeatures>
207207
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isAbstract" ordered="false"
208-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
208+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean"/>
209209
</eClassifiers>
210210
<eClassifiers xsi:type="ecore:EClass" name="Generalization" eSuperTypes="#//Relationship">
211211
<eStructuralFeatures xsi:type="ecore:EReference" name="general" ordered="false"
@@ -229,11 +229,9 @@
229229
</eClassifiers>
230230
<eClassifiers xsi:type="ecore:EClass" name="FeatureMembership" eSuperTypes="#//Membership">
231231
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isDerived" ordered="false"
232-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
233-
defaultValueLiteral="false"/>
232+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
234233
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isReadOnly" ordered="false"
235-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
236-
defaultValueLiteral="false"/>
234+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
237235
<eStructuralFeatures xsi:type="ecore:EReference" name="memberFeature" ordered="false"
238236
lowerBound="1" eType="#//Feature">
239237
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
@@ -246,11 +244,9 @@
246244
<eAnnotations source="redefines" references="#//Membership/ownedMemberElement"/>
247245
</eStructuralFeatures>
248246
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isPart" ordered="false"
249-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
250-
defaultValueLiteral="false"/>
247+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
251248
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isPort" ordered="false"
252-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
253-
defaultValueLiteral="false"/>
249+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
254250
<eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" ordered="false"
255251
eType="#//FeatureDirectionKind"/>
256252
<eStructuralFeatures xsi:type="ecore:EReference" name="owningCategory" ordered="false"
@@ -282,11 +278,9 @@
282278
</eAnnotations>
283279
</eStructuralFeatures>
284280
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isUnique" ordered="false"
285-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
286-
defaultValueLiteral="true"/>
281+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="true"/>
287282
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isOrdered" ordered="false"
288-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
289-
defaultValueLiteral="false"/>
283+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
290284
<eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" upperBound="-1"
291285
eType="#//Category">
292286
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
@@ -321,14 +315,14 @@
321315
<eStructuralFeatures xsi:type="ecore:EReference" name="owningFeatureMembership"
322316
ordered="false" eType="#//FeatureMembership" eOpposite="#//FeatureMembership/ownedFeatureElement"/>
323317
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isComposite" ordered="false"
324-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
325-
volatile="true" transient="true" defaultValueLiteral="false" derived="true"/>
318+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" volatile="true"
319+
transient="true" defaultValueLiteral="false" derived="true"/>
326320
<eStructuralFeatures xsi:type="ecore:EAttribute" name="multiplicity" ordered="false"
327-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
328-
volatile="true" transient="true" defaultValueLiteral="[0..*]" derived="true"/>
321+
lowerBound="1" eType="ecore:EDataType types.ecore#//String" volatile="true"
322+
transient="true" defaultValueLiteral="[0..*]" derived="true"/>
329323
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isNonunique" ordered="false"
330-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
331-
volatile="true" transient="true" defaultValueLiteral="false" derived="true"/>
324+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" volatile="true"
325+
transient="true" defaultValueLiteral="false" derived="true"/>
332326
</eClassifiers>
333327
<eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//Function"/>
334328
<eClassifiers xsi:type="ecore:EClass" name="Redefinition" eSuperTypes="#//Subset">
@@ -405,8 +399,7 @@
405399
<eAnnotations source="redefines" references="#//Feature/type"/>
406400
</eStructuralFeatures>
407401
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isDirected" ordered="false"
408-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
409-
defaultValueLiteral="false"/>
402+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" defaultValueLiteral="false"/>
410403
<eStructuralFeatures xsi:type="ecore:EReference" name="connectorEnd" lowerBound="2"
411404
upperBound="-1" eType="#//ConnectorEnd" containment="true" eOpposite="#//ConnectorEnd/connector"/>
412405
<eStructuralFeatures xsi:type="ecore:EReference" name="ownedAssociationType" ordered="false"
@@ -452,7 +445,7 @@
452445
</eClassifiers>
453446
<eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//Element">
454447
<eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" lowerBound="1"
455-
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
448+
eType="ecore:EDataType types.ecore#//String"/>
456449
<eStructuralFeatures xsi:type="ecore:EReference" name="commentedElement" ordered="false"
457450
lowerBound="1" eType="#//Element">
458451
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
@@ -490,12 +483,12 @@
490483
</eClassifiers>
491484
<eClassifiers xsi:type="ecore:EClass" name="LiteralBoolean" eSuperTypes="#//LiteralExpression">
492485
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
493-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
486+
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean"/>
494487
</eClassifiers>
495488
<eClassifiers xsi:type="ecore:EClass" name="LiteralExpression" eSuperTypes="#//Expression"/>
496489
<eClassifiers xsi:type="ecore:EClass" name="LiteralInteger" eSuperTypes="#//LiteralExpression">
497490
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
498-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
491+
lowerBound="1" eType="ecore:EDataType types.ecore#//Integer"/>
499492
</eClassifiers>
500493
<eClassifiers xsi:type="ecore:EClass" name="LiteralNull" eSuperTypes="#//LiteralExpression"/>
501494
<eClassifiers xsi:type="ecore:EClass" name="LiteralReal" eSuperTypes="#//LiteralExpression">
@@ -504,7 +497,7 @@
504497
</eClassifiers>
505498
<eClassifiers xsi:type="ecore:EClass" name="LiteralString" eSuperTypes="#//LiteralExpression">
506499
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
507-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
500+
lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
508501
</eClassifiers>
509502
<eClassifiers xsi:type="ecore:EClass" name="LiteralUnbounded" eSuperTypes="#//LiteralExpression"/>
510503
<eClassifiers xsi:type="ecore:EClass" name="OfSuccession">
@@ -526,7 +519,7 @@
526519
</eAnnotations>
527520
</eStructuralFeatures>
528521
<eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
529-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
522+
lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
530523
</eClassifiers>
531524
<eClassifiers xsi:type="ecore:EClass" name="SequenceAccessExpression" eSuperTypes="#//Expression">
532525
<eStructuralFeatures xsi:type="ecore:EReference" name="primary" ordered="false"

‎org.omg.sysml/model/SysML.genmodel‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
modelDirectory="/org.omg.sysml/syntax-gen" modelPluginID="org.omg.sysml"
55
modelName="SysML" modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
66
importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
7-
usedGenPackages="../../org.eclipse.uml2.types/model/Types.genmodel#//types" operationReflection="true"
8-
importOrganizing="true">
7+
operationReflection="true" importOrganizing="true">
98
<genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
109
<details key="OPPOSITE_ROLE_NAMES" value="PROCESS"/>
1110
<details key="DUPLICATE_FEATURES" value="DISCARD"/>
@@ -306,4 +305,12 @@
306305
<genClasses xsi:type="genmodel:GenClass" ecoreClass="SysML.ecore#//Succession"/>
307306
<genClasses xsi:type="genmodel:GenClass" ecoreClass="SysML.ecore#//SuccessionItemFlow"/>
308307
</genPackages>
308+
<genPackages xsi:type="genmodel:GenPackage" prefix="Types" basePackage="org.omg.sysml.lang.types"
309+
disposableProviderFactory="true" ecorePackage="types.ecore#/">
310+
<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Boolean"/>
311+
<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Integer"/>
312+
<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Real"/>
313+
<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//UnlimitedNatural"/>
314+
<genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//String"/>
315+
</genPackages>
309316
</genmodel:GenModel>

0 commit comments

Comments
 (0)