diff options
| author | Camille Letavernier | 2015-05-19 08:46:31 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2015-05-19 08:46:31 +0000 |
| commit | d6464c62e6a81eef4ffc53cef4000e6c0ab3383d (patch) | |
| tree | 534eba0781ecbe4ea0a8ad4b649e80c8bada1743 /extraplugins/umlrt | |
| parent | cf5084e17da10f41af48ae9d73fa17eafc490e1b (diff) | |
| download | org.eclipse.papyrus-d6464c62e6a81eef4ffc53cef4000e6c0ab3383d.tar.gz org.eclipse.papyrus-d6464c62e6a81eef4ffc53cef4000e6c0ab3383d.tar.xz org.eclipse.papyrus-d6464c62e6a81eef4ffc53cef4000e6c0ab3383d.zip | |
461830: [UML-RT] Incorrect name of literal in enumeration
PortRegistrationType in UML-RT profile
https://bugs.eclipse.org/bugs/show_bug.cgi?id=461830
- Update the Model import transformation for RT models
Change-Id: I693002a5527e8a2eb76cbd4e338a8d4535d685b6
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'extraplugins/umlrt')
| -rw-r--r-- | extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore | 18 | ||||
| -rw-r--r-- | extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore index e3c9eea0c37..234c111feec 100644 --- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore +++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTime.ecore @@ -6,18 +6,18 @@ <details key="documentation" value="base_Class.isActive
base_Class.ownedReception->isEmpty()
not(base_Class.isFinalSpecialization)
(base_Class.generalization->size()) <= 1
(base_Class.generalization->notEmpty()) implies (base_Class.generalization->forAll (g | g.isSubstitutable))
base_Class.ownedAttribute->forAll(at | at.type->size() = 1)
base_Class.nestedClassifier->isEmpty()
base_Class.ownedOperation->notEmpty() implies 
 (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::guarded))"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CapsulePart"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Protocol"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="base_Collaboration.generalization->size() <= 1"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Collaboration" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Collaboration"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTPort"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> @@ -38,7 +38,7 @@ lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String" defaultValueLiteral=""/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Port"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Port"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="PortRegistrationType"> <eLiterals name="Automatic"/> @@ -50,24 +50,24 @@ <details key="documentation" value="base_Connector.end->size() = 2"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Connector" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Connector"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Connector"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ProtocolContainer"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTRedefinedElement"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="let el = base_RedefinableElement in
(el.oclIsKindOf(UML::Port) or
 el.oclIsKindOf(UML::Property) or
 el.oclIsKindOf(UML::Operation) or
 el.oclIsKindOf(UML::Behavior) or
 el.oclIsKindOf(UML::Region) or
 el.oclIsKindOf(UML::State) or
 el.oclIsKindOf(UML::StateMachine) or
 el.oclIsKindOf(UML::Transition))"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_RedefinableElement" - ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/> + ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/> <eStructuralFeatures xsi:type="ecore:EReference" name="rootFragment" ordered="false" - eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/> + eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTMessageSet"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Interface" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Interface"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interface"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="rtMsgKind" ordered="false" lowerBound="1" eType="#//RTMessageKind" defaultValueLiteral="in"/> </eClassifiers> diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore index 1aee5ee940a..8d62563118d 100644 --- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore +++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/umlProfile/UMLRealTimeStateMach.ecore @@ -7,31 +7,31 @@ <details key="documentation" value="base_StateMachine.region->size() = 1
not base_StateMachine.isReentrant
(base_StateMachine.ownedParameter->size()=0) and 
(base_StateMachine.ownedParameterSet->size() = 0)
(base_StateMachine.context->size()=1) 
and (base_StateMachine.context.oclIsKindOf(Class))
isPassive = not (base_StateMachine.context.oclAsType(Class).isActive) 
isPassive implies not (base_StateMachine.isReentrant)"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_StateMachine" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//StateMachine"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPassive" ordered="false" - lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean" + lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean" defaultValueLiteral="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTRegion"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Region" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Region"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Region"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTState"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="base_State.isComposite implies 
 (base_State.region->size() = 1)
not base_State.isSubmachineState
base_State.doActivity->size() = 0
base_State.deferrableTrigger->size() = 0"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_State" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//State"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//State"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTPseudostate"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="let knd = base_Pseudostate.kind in 
 (knd <> UML::PseudostateKind::shallowHistory) and
 (knd <> UML::PseudostateKind::fork) and
 (knd <> UML::PseudostateKind::join)"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Pseudostate" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Pseudostate"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Pseudostate"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="RTTrigger"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Operation" ordered="false" - lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> </eClassifiers> </ecore:EPackage> |