diff options
| author | aradermache | 2013-05-14 11:36:34 +0000 |
|---|---|---|
| committer | aradermache | 2013-05-14 11:36:34 +0000 |
| commit | 475416175cb8fefbf4c2d6dbc5782e04142aa2b5 (patch) | |
| tree | 3e34204c641d5a33d0a6866e71a40ceb47a5eafe | |
| parent | 68a5200abd264d4cb595d56a7671dacc833f298f (diff) | |
| download | org.eclipse.papyrus-475416175cb8fefbf4c2d6dbc5782e04142aa2b5.tar.gz org.eclipse.papyrus-475416175cb8fefbf4c2d6dbc5782e04142aa2b5.tar.xz org.eclipse.papyrus-475416175cb8fefbf4c2d6dbc5782e04142aa2b5.zip | |
Delete "conjugated" attribute from Port stereotype within FCM profile, since already supported by UML.
14 files changed, 272 insertions, 359 deletions
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore index f6d1d5996ba..220709b20df 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore @@ -106,8 +106,6 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="requiredInterface" ordered="false" unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Interface" changeable="false" volatile="true" transient="true" unsettable="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="conjugated" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ConfigurableElementInstance" abstract="true"> <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" ordered="false" diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel index 97975b6dda1..398815ee396 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel @@ -75,7 +75,6 @@ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//Port/kind"/> <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference FCM.ecore#//Port/providedInterface"/> <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference FCM.ecore#//Port/requiredInterface"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FCM.ecore#//Port/conjugated"/> </genClasses> <genClasses image="false" ecoreClass="FCM.ecore#//ConfigurableElementInstance"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ConfigurableElementInstance/configuration"/> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di index 11253fe1b4c..93a43d765fd 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode"> <di:SashWindowsMngr> <pageList> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation index db696352d9c..0cad1576dca 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation @@ -628,14 +628,14 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_v87JeYKhEd-aI_x8ivV7vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v87JeoKhEd-aI_x8ivV7vQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_v87Je4KhEd-aI_x8ivV7vQ" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_v87Je4KhEd-aI_x8ivV7vQ" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_v87JfIKhEd-aI_x8ivV7vQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_v87JfYKhEd-aI_x8ivV7vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v87JfoKhEd-aI_x8ivV7vQ"/> </children> <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_v857UYKhEd-aI_x8ivV7vQ"/> <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_LXr4ICI8Ed-Vp7msgJA8uw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v857UoKhEd-aI_x8ivV7vQ" x="75" y="195" width="193" height="136"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v857UoKhEd-aI_x8ivV7vQ" x="75" y="195" width="193" height="121"/> </children> <children xmi:type="notation:Shape" xmi:id="_x-3zEIKhEd-aI_x8ivV7vQ" type="1026" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x-4aIIKhEd-aI_x8ivV7vQ" source="ShadowFigure"> @@ -653,7 +653,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_x-4aKYKhEd-aI_x8ivV7vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-4aKoKhEd-aI_x8ivV7vQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_x-4aK4KhEd-aI_x8ivV7vQ" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_x-4aK4KhEd-aI_x8ivV7vQ" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_x-4aLIKhEd-aI_x8ivV7vQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x-4aLYKhEd-aI_x8ivV7vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-4aLoKhEd-aI_x8ivV7vQ"/> @@ -696,7 +696,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_zA9tDJMaEd-I9dVdNhZAGQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zA9tDZMaEd-I9dVdNhZAGQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_zA9tDpMaEd-I9dVdNhZAGQ" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_zA9tDpMaEd-I9dVdNhZAGQ" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_zA9tD5MaEd-I9dVdNhZAGQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_zA9tEJMaEd-I9dVdNhZAGQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zA9tEZMaEd-I9dVdNhZAGQ"/> @@ -1327,10 +1327,16 @@ <children xmi:type="notation:DecorationNode" xmi:id="_VShZEJWJEd-xqrYFQVL_qg" type="1034"/> <children xmi:type="notation:BasicCompartment" xmi:id="_VShZEZWJEd-xqrYFQVL_qg" type="1071"> <children xmi:type="notation:Shape" xmi:id="_gQNOoJWJEd-xqrYFQVL_qg" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8VyVALmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8VyVAbmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_xdmfIMuHEd2H_o0jIC6qDQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_gQNOoZWJEd-xqrYFQVL_qg" x="65" y="5"/> </children> <children xmi:type="notation:Shape" xmi:id="_gQxPUJWJEd-xqrYFQVL_qg" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8tsesLmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ttFwLmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_wa_yoMuHEd2H_o0jIC6qDQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_gQxPUZWJEd-xqrYFQVL_qg" x="65" y="5"/> </children> @@ -1342,6 +1348,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yidrUuSBEeCPMMwBhvVAnA" key="PropStereoDisplay" value=""/> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yidrU-SBEeCPMMwBhvVAnA" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9LnJwLmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9Lnw0LmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_nkb3gOSBEeCPMMwBhvVAnA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_nk6YoOSBEeCPMMwBhvVAnA"/> </children> @@ -1349,13 +1358,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_VShZE5WJEd-xqrYFQVL_qg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VShZFJWJEd-xqrYFQVL_qg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_VShZFZWJEd-xqrYFQVL_qg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_VShZFZWJEd-xqrYFQVL_qg" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_VShZFpWJEd-xqrYFQVL_qg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VShZF5WJEd-xqrYFQVL_qg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VShZGJWJEd-xqrYFQVL_qg"/> </children> <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_tBRZYMtpEd2H_o0jIC6qDQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VSgyAZWJEd-xqrYFQVL_qg" x="450" y="165" width="235"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VSgyAZWJEd-xqrYFQVL_qg" x="450" y="165" width="271" height="106"/> </children> <children xmi:type="notation:Shape" xmi:id="_V3iKoJWJEd-xqrYFQVL_qg" type="1026" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3ixsJWJEd-xqrYFQVL_qg" source="ShadowFigure"> @@ -1377,6 +1386,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dFn5M5jPEd-YabZhJFlJ9g" key="PropStereoDisplay" value=""/> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dFn5NJjPEd-YabZhJFlJ9g" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0aLJULmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0aMXcLmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_nZNicMweEd2H_o0jIC6qDQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_ZDvA4ZWJEd-xqrYFQVL_qg" x="48" y="12"/> </children> @@ -1388,28 +1400,30 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cjOWwZjPEd-YabZhJFlJ9g" key="PropStereoDisplay" value=""/> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cjOWwpjPEd-YabZhJFlJ9g" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_06XsULmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_06XsUbmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_ml85gMweEd2H_o0jIC6qDQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_ZEVd0ZWJEd-xqrYFQVL_qg" x="48" y="12"/> </children> <children xmi:type="notation:Shape" xmi:id="_ZFG54JWJEd-xqrYFQVL_qg" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1UsQ0LmNEeKsCfS4vGDjZw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1Us34LmNEeKsCfS4vGDjZw" key="CustomAppearance_MaskValue" value="24"/> + </eAnnotations> <element xmi:type="uml:Property" href="FCM.profile.uml#_AorBUMtrEd2H_o0jIC6qDQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_ZFG54ZWJEd-xqrYFQVL_qg" x="48" y="12"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ZGCuAJWJEd-xqrYFQVL_qg" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0"> - <element xmi:type="uml:Property" href="FCM.profile.uml#_rPkp8FD6Ed66Asc5WgWosA"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_ZGCuAZWJEd-xqrYFQVL_qg" x="48" y="12"/> - </children> <styles xmi:type="notation:SortingStyle" xmi:id="_V3ixuJWJEd-xqrYFQVL_qg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_V3ixuZWJEd-xqrYFQVL_qg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3ixupWJEd-xqrYFQVL_qg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_V3ixu5WJEd-xqrYFQVL_qg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_V3ixu5WJEd-xqrYFQVL_qg" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_V3ixvJWJEd-xqrYFQVL_qg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_V3ixvZWJEd-xqrYFQVL_qg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3ixvpWJEd-xqrYFQVL_qg"/> </children> <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3iKoZWJEd-xqrYFQVL_qg" x="144" y="165" width="226" height="126"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3iKoZWJEd-xqrYFQVL_qg" x="126" y="165" width="289" height="106"/> </children> <children xmi:type="notation:Shape" xmi:id="_iw1YUJWJEd-xqrYFQVL_qg" type="1031" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iw1YUpWJEd-xqrYFQVL_qg" source="ShadowFigure"> @@ -1423,7 +1437,7 @@ </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_iw1_ZJWJEd-xqrYFQVL_qg" type="1084"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iw1YUZWJEd-xqrYFQVL_qg" x="144" y="60" width="226"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iw1YUZWJEd-xqrYFQVL_qg" x="126" y="60" width="289"/> </children> <children xmi:type="notation:Shape" xmi:id="_jWfqIJWJEd-xqrYFQVL_qg" type="1031" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jWfqIpWJEd-xqrYFQVL_qg" source="ShadowFigure"> @@ -1437,7 +1451,7 @@ </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_jWgRMJWJEd-xqrYFQVL_qg" type="1084"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jWfqIZWJEd-xqrYFQVL_qg" x="450" y="60" width="235"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jWfqIZWJEd-xqrYFQVL_qg" x="450" y="60" width="271"/> </children> <children xmi:type="notation:Shape" xmi:id="_KCSSsDyEEeCYGtteoBz6vQ" type="1026" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KCV9EDyEEeCYGtteoBz6vQ" source="ShadowFigure"> @@ -1455,13 +1469,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_KCWkJTyEEeCYGtteoBz6vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCWkJjyEEeCYGtteoBz6vQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_KCWkJzyEEeCYGtteoBz6vQ" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KCWkJzyEEeCYGtteoBz6vQ" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_KCWkKDyEEeCYGtteoBz6vQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_KCWkKTyEEeCYGtteoBz6vQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCWkKjyEEeCYGtteoBz6vQ"/> </children> <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_KBrOsDyEEeCYGtteoBz6vQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCSSsTyEEeCYGtteoBz6vQ" x="144" y="337" width="227"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCSSsTyEEeCYGtteoBz6vQ" x="126" y="306" width="289" height="82"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_UBBU8ZWJEd-xqrYFQVL_qg"/> <element xmi:type="uml:Profile" href="FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> @@ -1514,7 +1528,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_3dfMU-bEEd-oHsJhS1620Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3dfMVObEEd-oHsJhS1620Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_3dfMVebEEd-oHsJhS1620Q" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_3dfMVebEEd-oHsJhS1620Q" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_3dfMVubEEd-oHsJhS1620Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_3dfMV-bEEd-oHsJhS1620Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3dfMWObEEd-oHsJhS1620Q"/> @@ -1638,7 +1652,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Uzy3lfPBEd-Tz5tQ_F9baw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uzy3lvPBEd-Tz5tQ_F9baw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_Uzy3l_PBEd-Tz5tQ_F9baw" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Uzy3l_PBEd-Tz5tQ_F9baw" visible="false" type="1019"> <styles xmi:type="notation:SortingStyle" xmi:id="_Uzy3mPPBEd-Tz5tQ_F9baw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_Uzy3mfPBEd-Tz5tQ_F9baw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uzy3mvPBEd-Tz5tQ_F9baw"/> @@ -1699,7 +1713,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x968ksniEeCWXsgs0yuyKQ"/> </children> <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x935QcniEeCWXsgs0yuyKQ" x="111" y="253" width="187" height="135"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x935QcniEeCWXsgs0yuyKQ" x="111" y="253" width="214" height="135"/> </children> <children xmi:type="notation:Shape" xmi:id="_0A7WIMniEeCWXsgs0yuyKQ" type="1031" fontName="Sans Serif" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0A7WIsniEeCWXsgs0yuyKQ" source="ShadowFigure"> @@ -1713,7 +1727,54 @@ </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_0A79NcniEeCWXsgs0yuyKQ" type="1084"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Node"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0A7WIcniEeCWXsgs0yuyKQ" x="108" y="126" width="181"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0A7WIcniEeCWXsgs0yuyKQ" x="108" y="126" width="217"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_7VhVgLMkEeKKMNfz1DLnog" type="1026" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7VkY0LMkEeKKMNfz1DLnog" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7VkY0bMkEeKKMNfz1DLnog" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7VkY0rMkEeKKMNfz1DLnog" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7VkY07MkEeKKMNfz1DLnog" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7Vk_4LMkEeKKMNfz1DLnog" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7Vk_4bMkEeKKMNfz1DLnog" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_7Vk_4rMkEeKKMNfz1DLnog" type="1034"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_7Vk_47MkEeKKMNfz1DLnog" type="1071"> + <styles xmi:type="notation:TitleStyle" xmi:id="_7Vk_5LMkEeKKMNfz1DLnog"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_7Vk_5bMkEeKKMNfz1DLnog"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_7Vk_5rMkEeKKMNfz1DLnog"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Vk_57MkEeKKMNfz1DLnog"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_7Vk_6LMkEeKKMNfz1DLnog" visible="false" type="1019"> + <styles xmi:type="notation:TitleStyle" xmi:id="_7Vk_6bMkEeKKMNfz1DLnog"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_7Vk_6rMkEeKKMNfz1DLnog"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_7Vk_67MkEeKKMNfz1DLnog"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Vk_7LMkEeKKMNfz1DLnog"/> + </children> + <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_361C4FapEd-w9f5DG2hQCA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7VhVgbMkEeKKMNfz1DLnog" x="396" y="256" width="145" height="132"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_8588sLMkEeKKMNfz1DLnog" type="1031" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_859jwLMkEeKKMNfz1DLnog" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_859jwbMkEeKKMNfz1DLnog" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_859jwrMkEeKKMNfz1DLnog" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_859jw7MkEeKKMNfz1DLnog" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_85-K0LMkEeKKMNfz1DLnog" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_85-K0bMkEeKKMNfz1DLnog" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_86DDULMkEeKKMNfz1DLnog" source="Stereotype_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqYLMkEeKKMNfz1DLnog" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqYbMkEeKKMNfz1DLnog" key="StereotypeList" value="StandardProfileL2::Metaclass"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqYrMkEeKKMNfz1DLnog" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqY7MkEeKKMNfz1DLnog" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqZLMkEeKKMNfz1DLnog" key="StereotypePropertyLocation" value="Compartment"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_85-K0rMkEeKKMNfz1DLnog" type="1084"/> + <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8588sbMkEeKKMNfz1DLnog" x="396" y="126" width="145"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_w-KvwcniEeCWXsgs0yuyKQ"/> <element xmi:type="uml:Profile" href="FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> @@ -1722,5 +1783,10 @@ <element xmi:type="uml:Extension" href="FCM.profile.uml#_biaAIJODEd-5qPBhYeIVtw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0CNvksniEeCWXsgs0yuyKQ" points="[-27, -50, 134, 253]$[-161, -303, 0, 0]"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_-yQiILMkEeKKMNfz1DLnog" type="1013" source="_7VhVgLMkEeKKMNfz1DLnog" target="_8588sLMkEeKKMNfz1DLnog" lineColor="0"> + <styles xmi:type="notation:FontStyle" xmi:id="_-yQiIbMkEeKKMNfz1DLnog" fontName="Sans Serif"/> + <element xmi:type="uml:Extension" href="FCM.profile.uml#_-jKo0FapEd-w9f5DG2hQCA"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-yQiIrMkEeKKMNfz1DLnog" points="[0, -66, 0, 105]$[0, -146, 0, 25]"/> + </edges> </notation:Diagram> </xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml index 027679a0642..6468f782bef 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml @@ -1,109 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"> <uml:Profile xmi:id="_5mvT0MtjEd2H_o0jIC6qDQ" name="FCM" metaclassReference="_NYUA4MtkEd2H_o0jIC6qDQ _pb8DsMtkEd2H_o0jIC6qDQ _WPBJkMtpEd2H_o0jIC6qDQ _WSSgAMtpEd2H_o0jIC6qDQ _4Sf2AMtpEd2H_o0jIC6qDQ _IDbl4MtvEd2H_o0jIC6qDQ _ofc4YMuHEd2H_o0jIC6qDQ _asQCAC5SEd6q9cO948d5Fw _5OunYGV9Ed6b6erIXzmEEA _nKCJAGu2Ed647PfocwT3eg _wo2GgMewEd6zpahAtGCOkA _9HS28MnvEd6fKfvcq7rbxA _Y3dP0DdMEd-Qn7_dAqT11Q _Zc-ksJODEd-5qPBhYeIVtw _wTDjYKvTEd-i17GN-GaZ6g _kK724LTaEd-jOpA9YHRXqw _03w64NXnEd-CUqOXH3INsw _eAlkcCm_EeKgOdm6HirHfA"> - <ownedComment xmi:id="_D0js0O69Ed2rSKyRUaSRjw"> + <ownedComment xmi:type="uml:Comment" xmi:id="_D0js0O69Ed2rSKyRUaSRjw"> <body>The associations between PortKind and Operation simply denote the fact that we want to target something that encapsulates the definition of interface mapping rules (i.e. the rules that determine the interfaces that are provided/required on a port 
 of a particular PortKind). Further experiments are still needed to confirm that the Operation metaclass is the right metaclass to encapsulate this definition.</body> </ownedComment> - <ownedComment xmi:id="_dxcGcDTvEd-aL8GNXYXa-Q" annotatedElement="_BOnDoFLpEd6rYflXebIz1g"> + <ownedComment xmi:type="uml:Comment" xmi:id="_dxcGcDTvEd-aL8GNXYXa-Q" annotatedElement="_BOnDoFLpEd6rYflXebIz1g"> <body>The template parameters list defines the parameters that are passed to the Acceleo template. If empty, the formal parameter list of the package template is used.</body> </ownedComment> - <ownedComment xmi:id="_2Lq5wDR4Ed-aL8GNXYXa-Q" annotatedElement="_zZEPQDR4Ed-aL8GNXYXa-Q"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2Lq5wDR4Ed-aL8GNXYXa-Q" annotatedElement="_zZEPQDR4Ed-aL8GNXYXa-Q"> <body>LateEvaluation is more a tempalte binding rather than a template definition. In</body> </ownedComment> - <ownedComment xmi:id="_tP3jMLy-Ed-9GLEvRgvEyg" annotatedElement="_L8b3wMtvEd2H_o0jIC6qDQ"> + <ownedComment xmi:type="uml:Comment" xmi:id="_tP3jMLy-Ed-9GLEvRgvEyg" annotatedElement="_L8b3wMtvEd2H_o0jIC6qDQ"> <body>This stereotype indicuates that the attribute does not only store values but needs to be configured initially be the user. It corresponds to the automatic creation of an entry (slot+nstance specification) in the deployment plan </body> </ownedComment> - <ownedComment xmi:id="_0h1qEMGiEd-BXcifqN3Y_A" annotatedElement="_aQTf0FSdEd-w9f5DG2hQCA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_0h1qEMGiEd-BXcifqN3Y_A" annotatedElement="_aQTf0FSdEd-w9f5DG2hQCA"> <body>A group of interaction components should apply both stereotypes. Each member of such a group must be an interaction component, but this is not enforced by the meta-model</body> </ownedComment> - <ownedComment xmi:id="_jJohACNgEeKGuM7MKNu-KA" annotatedElement="_DaA8UCNaEeKGuM7MKNu-KA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_jJohACNgEeKGuM7MKNu-KA" annotatedElement="_DaA8UCNaEeKGuM7MKNu-KA"> <body>A rule that is applied to a package applies automatically to all elements that are contained within</body> </ownedComment> - <elementImport xmi:id="_NYUA4MtkEd2H_o0jIC6qDQ" alias="Package"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_NYUA4MtkEd2H_o0jIC6qDQ" alias="Package"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </elementImport> - <elementImport xmi:id="_pb8DsMtkEd2H_o0jIC6qDQ" alias="Class"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_pb8DsMtkEd2H_o0jIC6qDQ" alias="Class"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </elementImport> - <elementImport xmi:id="_WPBJkMtpEd2H_o0jIC6qDQ" alias="Port"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_WPBJkMtpEd2H_o0jIC6qDQ" alias="Port"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/> </elementImport> - <elementImport xmi:id="_WSSgAMtpEd2H_o0jIC6qDQ" alias="Connector"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_WSSgAMtpEd2H_o0jIC6qDQ" alias="Connector"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/> </elementImport> - <elementImport xmi:id="_4Sf2AMtpEd2H_o0jIC6qDQ" alias="Operation"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_4Sf2AMtpEd2H_o0jIC6qDQ" alias="Operation"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </elementImport> - <elementImport xmi:id="_IDbl4MtvEd2H_o0jIC6qDQ" alias="Property"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_IDbl4MtvEd2H_o0jIC6qDQ" alias="Property"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </elementImport> - <elementImport xmi:id="_ofc4YMuHEd2H_o0jIC6qDQ" alias="Interface"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_ofc4YMuHEd2H_o0jIC6qDQ" alias="Interface"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> </elementImport> - <elementImport xmi:id="_asQCAC5SEd6q9cO948d5Fw" alias="InstanceSpecification"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_asQCAC5SEd6q9cO948d5Fw" alias="InstanceSpecification"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/> </elementImport> - <elementImport xmi:id="_5OunYGV9Ed6b6erIXzmEEA" alias="Element"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_5OunYGV9Ed6b6erIXzmEEA" alias="Element"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> </elementImport> - <elementImport xmi:id="_nKCJAGu2Ed647PfocwT3eg" alias="Generalization"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_nKCJAGu2Ed647PfocwT3eg" alias="Generalization"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> </elementImport> - <elementImport xmi:id="_wo2GgMewEd6zpahAtGCOkA" alias="Collaboration"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_wo2GgMewEd6zpahAtGCOkA" alias="Collaboration"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/> </elementImport> - <elementImport xmi:id="_9HS28MnvEd6fKfvcq7rbxA" alias="PrimitiveType"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_9HS28MnvEd6fKfvcq7rbxA" alias="PrimitiveType"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/> </elementImport> - <elementImport xmi:id="_Y3dP0DdMEd-Qn7_dAqT11Q" alias="TemplateSignature"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_Y3dP0DdMEd-Qn7_dAqT11Q" alias="TemplateSignature"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/> </elementImport> - <elementImport xmi:id="_Zc-ksJODEd-5qPBhYeIVtw" alias="Node"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_Zc-ksJODEd-5qPBhYeIVtw" alias="Node"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Node"/> </elementImport> - <elementImport xmi:id="_wTDjYKvTEd-i17GN-GaZ6g" alias="Comment"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_wTDjYKvTEd-i17GN-GaZ6g" alias="Comment"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/> </elementImport> - <elementImport xmi:id="_kK724LTaEd-jOpA9YHRXqw" alias="Abstraction"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_kK724LTaEd-jOpA9YHRXqw" alias="Abstraction"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/> </elementImport> - <elementImport xmi:id="_03w64NXnEd-CUqOXH3INsw" alias="Slot"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_03w64NXnEd-CUqOXH3INsw" alias="Slot"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Slot"/> </elementImport> - <elementImport xmi:id="_eAlkcCm_EeKgOdm6HirHfA" alias="Feature"> + <elementImport xmi:type="uml:ElementImport" xmi:id="_eAlkcCm_EeKgOdm6HirHfA" alias="Feature"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/> </elementImport> - <packageImport xmi:id="_5mvT0ctjEd2H_o0jIC6qDQ"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_5mvT0ctjEd2H_o0jIC6qDQ"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> <packagedElement xmi:type="uml:Stereotype" xmi:id="_te7YAMtkEd2H_o0jIC6qDQ" name="RuleApplication"> - <ownedAttribute xmi:id="_8Rw6MctkEd2H_o0jIC6qDQ" name="base_Class" isUnique="false" association="_8QuYYMtkEd2H_o0jIC6qDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_8Rw6MctkEd2H_o0jIC6qDQ" name="base_Class" isUnique="false" association="_8QuYYMtkEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_r2VLUJD2Ed-I9dVdNhZAGQ" name="containerRule" visibility="public" type="_5SI38AAhEd-0dMgailnZgA" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_r2VLUJD2Ed-I9dVdNhZAGQ" name="containerRule" visibility="public" type="_5SI38AAhEd-0dMgailnZgA" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zTT6QJD2Ed-I9dVdNhZAGQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zTVIYJD2Ed-I9dVdNhZAGQ" value="*"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_i5ZywO34EeCMv89l8IxFBg"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_DZQuYCNaEeKGuM7MKNu-KA" name="base_Package" association="_DaA8UCNaEeKGuM7MKNu-KA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_DZQuYCNaEeKGuM7MKNu-KA" name="base_Package" association="_DaA8UCNaEeKGuM7MKNu-KA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </ownedAttribute> - <icon xmi:id="_UvJO8PupEd6Ur5Lh7TH4tA" content="71%73%70%56%57%97%16%0%16%0%-29%12%0%20%30%100%29%39%109%39%49%119%40%50%120%49%59%-127%60%70%-116%80%90%-101%80%90%-100%120%-126%-70%120%-126%-69%-106%-96%-46%-76%-76%-76%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%33%-7%4%1%10%0%15%0%44%0%0%0%0%16%0%16%0%0%4%50%-16%-55%73%-21%92%56%107%76%-105%-19%-109%33%126%-110%39%25%-117%-15%108%-100%-7%-120%-22%5%-54%115%25%-114%-76%125%-90%-11%122%-57%-70%-96%-81%-25%26%-110%-118%69%11%-110%36%100%-79%-104%-52%8%0%59%"> - <eAnnotations xmi:id="_VsSzsPupEd6Ur5Lh7TH4tA" source="image_papyrus"> - <details xmi:id="_VsV3APupEd6Ur5Lh7TH4tA" key="image_kind_key" value="icon"/> + <icon xmi:type="uml:Image" xmi:id="_UvJO8PupEd6Ur5Lh7TH4tA" content="71%73%70%56%57%97%16%0%16%0%-29%12%0%20%30%100%29%39%109%39%49%119%40%50%120%49%59%-127%60%70%-116%80%90%-101%80%90%-100%120%-126%-70%120%-126%-69%-106%-96%-46%-76%-76%-76%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%33%-7%4%1%10%0%15%0%44%0%0%0%0%16%0%16%0%0%4%50%-16%-55%73%-21%92%56%107%76%-105%-19%-109%33%126%-110%39%25%-117%-15%108%-100%-7%-120%-22%5%-54%115%25%-114%-76%125%-90%-11%122%-57%-70%-96%-81%-25%26%-110%-118%69%11%-110%36%100%-79%-104%-52%8%0%59%"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VsSzsPupEd6Ur5Lh7TH4tA" source="image_papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VsV3APupEd6Ur5Lh7TH4tA" key="image_kind_key" value="icon"/> </eAnnotations> </icon> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_zjaC8MtkEd2H_o0jIC6qDQ" name="Singleton"> - <ownedAttribute xmi:id="_Bo7rsEzvEeG_JK8KIEXPxQ" name="base_Class" association="_Bo7rsUzvEeG_JK8KIEXPxQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_Bo7rsEzvEeG_JK8KIEXPxQ" name="base_Class" association="_Bo7rsUzvEeG_JK8KIEXPxQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <icon xmi:id="_lAeIYPupEd6Ur5Lh7TH4tA" content="71%73%70%56%57%97%16%0%16%0%-29%12%0%20%30%100%29%39%109%39%49%119%40%50%120%49%59%-127%60%70%-116%80%90%-101%80%90%-100%120%-126%-70%120%-126%-69%-106%-96%-46%-76%-76%-76%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%33%-7%4%1%10%0%15%0%44%0%0%0%0%16%0%16%0%0%4%52%-16%-55%73%-21%92%56%107%76%-105%-19%-109%33%126%-110%39%25%-117%113%113%101%56%94%32%28%-73%-25%75%-33%-88%42%-29%-10%99%-34%-66%-54%47%-72%-13%-79%-120%64%-53%112%-88%-20%108%-98%-92%-24%35%2%0%59%" format="" location=""> - <eAnnotations xmi:id="_l07EIPupEd6Ur5Lh7TH4tA" source="image_papyrus"> - <details xmi:id="_l08SQPupEd6Ur5Lh7TH4tA" key="image_kind_key" value="icon"/> + <icon xmi:type="uml:Image" xmi:id="_lAeIYPupEd6Ur5Lh7TH4tA" content="71%73%70%56%57%97%16%0%16%0%-29%12%0%20%30%100%29%39%109%39%49%119%40%50%120%49%59%-127%60%70%-116%80%90%-101%80%90%-100%120%-126%-70%120%-126%-69%-106%-96%-46%-76%-76%-76%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%-1%33%-7%4%1%10%0%15%0%44%0%0%0%0%16%0%16%0%0%4%52%-16%-55%73%-21%92%56%107%76%-105%-19%-109%33%126%-110%39%25%-117%113%113%101%56%94%32%28%-73%-25%75%-33%-88%42%-29%-10%99%-34%-66%-54%47%-72%-13%-79%-120%64%-53%112%-88%-20%108%-98%-92%-24%35%2%0%59%" format="" location=""> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_l07EIPupEd6Ur5Lh7TH4tA" source="image_papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_l08SQPupEd6Ur5Lh7TH4tA" key="image_kind_key" value="icon"/> </eAnnotations> </icon> </packagedElement> @@ -111,36 +111,36 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_8Rw6MMtkEd2H_o0jIC6qDQ" name="extension_RuleApplication" type="_te7YAMtkEd2H_o0jIC6qDQ" aggregation="composite" association="_8QuYYMtkEd2H_o0jIC6qDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_Z1W68MtlEd2H_o0jIC6qDQ" name="InteractionComponent"> - <ownedAttribute xmi:id="_X4RqMFaaEd-w9f5DG2hQCA" name="forDistribution" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_X4RqMFaaEd-w9f5DG2hQCA" name="forDistribution" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_afN3QFaaEd-w9f5DG2hQCA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_agsd8FaaEd-w9f5DG2hQCA" value="1"/> <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="MultiplicityElement-isOrdered-_defaultValue"/> </ownedAttribute> - <ownedAttribute xmi:id="_zhkAEMewEd6zpahAtGCOkA" name="connectionPattern" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_zhkAEMewEd6zpahAtGCOkA" name="connectionPattern" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Collaboration"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zh5XQMewEd6zpahAtGCOkA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zh6lYMewEd6zpahAtGCOkA" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_f-DFcEzuEeG_JK8KIEXPxQ" name="base_Class" association="_f-DsgEzuEeG_JK8KIEXPxQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_f-DFcEzuEeG_JK8KIEXPxQ" name="base_Class" association="_f-DsgEzuEeG_JK8KIEXPxQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_tBRZYMtpEd2H_o0jIC6qDQ" name="PortKind"> - <ownedAttribute xmi:id="_PnUnYctqEd2H_o0jIC6qDQ" name="base_Class" isUnique="false" association="_PlrooMtqEd2H_o0jIC6qDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_PnUnYctqEd2H_o0jIC6qDQ" name="base_Class" isUnique="false" association="_PlrooMtqEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_wa_yoMuHEd2H_o0jIC6qDQ" name="providedInterface" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_wa_yoMuHEd2H_o0jIC6qDQ" name="providedInterface" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wbI8kMuHEd2H_o0jIC6qDQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wbI8kcuHEd2H_o0jIC6qDQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_xdmfIMuHEd2H_o0jIC6qDQ" name="requiredInterface" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_xdmfIMuHEd2H_o0jIC6qDQ" name="requiredInterface" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xdwQIMuHEd2H_o0jIC6qDQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xdwQIcuHEd2H_o0jIC6qDQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_nkb3gOSBEeCPMMwBhvVAnA" name="extendedPort" visibility="public" isReadOnly="true" isDerived="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_nkb3gOSBEeCPMMwBhvVAnA" name="extendedPort" visibility="public" isReadOnly="true" isDerived="true"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pHFWAOSBEeCPMMwBhvVAnA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pHLcoOSBEeCPMMwBhvVAnA" value="1"/> @@ -148,9 +148,9 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <icon xmi:id="_cCkwQDrYEeGmX53MUlt37g"> - <eAnnotations xmi:id="_dgh8ADrYEeGmX53MUlt37g" source="image_papyrus"> - <details xmi:id="_dgijEDrYEeGmX53MUlt37g" key="image_kind_key" value="icon"/> + <icon xmi:type="uml:Image" xmi:id="_cCkwQDrYEeGmX53MUlt37g"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dgh8ADrYEeGmX53MUlt37g" source="image_papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dgijEDrYEeGmX53MUlt37g" key="image_kind_key" value="icon"/> </eAnnotations> </icon> </packagedElement> @@ -158,30 +158,27 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_PnUnYMtqEd2H_o0jIC6qDQ" name="extension_FCM_PortKind" type="_tBRZYMtpEd2H_o0jIC6qDQ" aggregation="composite" association="_PlrooMtqEd2H_o0jIC6qDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_pP-ckMtqEd2H_o0jIC6qDQ" name="Port"> - <generalization xmi:id="_GAtDsMtwEd2H_o0jIC6qDQ" general="_d1T90MtvEd2H_o0jIC6qDQ"/> - <ownedAttribute xmi:id="_y3Zp0MtqEd2H_o0jIC6qDQ" name="base_Port" isUnique="false" association="_y0ITYMtqEd2H_o0jIC6qDQ"> + <generalization xmi:type="uml:Generalization" xmi:id="_GAtDsMtwEd2H_o0jIC6qDQ" general="_d1T90MtvEd2H_o0jIC6qDQ"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_y3Zp0MtqEd2H_o0jIC6qDQ" name="base_Port" isUnique="false" association="_y0ITYMtqEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/> </ownedAttribute> - <ownedAttribute xmi:id="_AorBUMtrEd2H_o0jIC6qDQ" name="kind" type="_tBRZYMtpEd2H_o0jIC6qDQ" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_AorBUMtrEd2H_o0jIC6qDQ" name="kind" type="_tBRZYMtpEd2H_o0jIC6qDQ" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G1nvUFRxEd6ckL6AwjSdEg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G1udAFRxEd6ckL6AwjSdEg" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_ml85gMweEd2H_o0jIC6qDQ" name="providedInterface" isUnique="false" isReadOnly="true" isDerived="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ml85gMweEd2H_o0jIC6qDQ" name="providedInterface" isUnique="false" isReadOnly="true" isDerived="true"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mmGqgMweEd2H_o0jIC6qDQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mmGqgcweEd2H_o0jIC6qDQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_nZNicMweEd2H_o0jIC6qDQ" name="requiredInterface" isUnique="false" isReadOnly="true" isDerived="true"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_nZNicMweEd2H_o0jIC6qDQ" name="requiredInterface" isUnique="false" isReadOnly="true" isDerived="true"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nZNiccweEd2H_o0jIC6qDQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nZNicsweEd2H_o0jIC6qDQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_rPkp8FD6Ed66Asc5WgWosA" name="conjugated" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> - </ownedAttribute> - <icon xmi:id="_YSnssDrYEeGmX53MUlt37g"> - <eAnnotations xmi:id="_aOu0EDrYEeGmX53MUlt37g" source="image_papyrus"> - <details xmi:id="_aOvbIDrYEeGmX53MUlt37g" key="image_kind_key" value="icon"/> + <icon xmi:type="uml:Image" xmi:id="_YSnssDrYEeGmX53MUlt37g"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aOu0EDrYEeGmX53MUlt37g" source="image_papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aOvbIDrYEeGmX53MUlt37g" key="image_kind_key" value="icon"/> </eAnnotations> </icon> </packagedElement> @@ -192,24 +189,24 @@ of a particular PortKind). Further experiments are still needed to confirm that </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_JWD9UMttEd2H_o0jIC6qDQ" name="Connector"> - <generalization xmi:id="_EfZpAMtwEd2H_o0jIC6qDQ" general="_d1T90MtvEd2H_o0jIC6qDQ"/> - <ownedAttribute xmi:id="_jHWxIcttEd2H_o0jIC6qDQ" name="base_Connector" isUnique="false" association="_jDoHsMttEd2H_o0jIC6qDQ"> + <generalization xmi:type="uml:Generalization" xmi:id="_EfZpAMtwEd2H_o0jIC6qDQ" general="_d1T90MtvEd2H_o0jIC6qDQ"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_jHWxIcttEd2H_o0jIC6qDQ" name="base_Connector" isUnique="false" association="_jDoHsMttEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/> </ownedAttribute> - <ownedAttribute xmi:id="_lznjEMttEd2H_o0jIC6qDQ" name="ic" visibility="public" type="_Z1W68MtlEd2H_o0jIC6qDQ" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_lznjEMttEd2H_o0jIC6qDQ" name="ic" visibility="public" type="_Z1W68MtlEd2H_o0jIC6qDQ" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9HGQoMttEd2H_o0jIC6qDQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9HQBoMttEd2H_o0jIC6qDQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_XdkcsEzvEeG_JK8KIEXPxQ"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_GEXGkMtuEd2H_o0jIC6qDQ" name="base_Property" isUnique="false" association="_F_vFQMtuEd2H_o0jIC6qDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_GEXGkMtuEd2H_o0jIC6qDQ" name="base_Property" isUnique="false" association="_F_vFQMtuEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> - <icon xmi:id="_TLgoYFyXEeGSFubOzJOnSg" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%20%0%0%0%12%8%0%0%0%0%71%103%-62%39%0%0%0%-85%73%68%65%84%8%-103%99%-8%15%4%91%61%94%-2%7%-125%57%-119%111%64%20%3%16%111%22%-13%-4%0%17%-36%40%28%-4%22%34%-72%85%-36%-27%49%68%-20%-1%-17%-123%66%-95%-17%64%-126%59%-60%44%54%-99%-127%-127%19%53%66%-31%-17%-2%51%-20%18%-77%-97%33%38%0%7%54%-45%4%35%-34%51%-56%40%63%124%-65%103%39%28%-100%-5%-35%-57%84%-49%16%-64%-65%-14%108%-80%47%28%84%62%13%18%-34%-64%-16%-50%91%-96%-36%-41%11%14%-94%-4%-124%22%3%45%122%-25%37%-72%-26%47%-44%-10%-1%-81%-62%4%23%-126%-99%-12%-42%67%112%29%84%-12%77%-104%-64%66%-88%-29%-33%-70%75%60%-123%8%-74%9%-52%-121%-7%-24%-1%-5%13%-33%33%-126%-41%15%-128%41%0%-105%3%-94%-119%-59%-55%85%100%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"> - <eAnnotations xmi:id="_TLgoYVyXEeGSFubOzJOnSg" source="image_papyrus"> - <details xmi:id="_TLgoYlyXEeGSFubOzJOnSg" key="image_kind_key" value="icon"/> - <details xmi:id="_TLgoY1yXEeGSFubOzJOnSg" key="image_name_key" value="conn"/> + <icon xmi:type="uml:Image" xmi:id="_TLgoYFyXEeGSFubOzJOnSg" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%20%0%0%0%12%8%0%0%0%0%71%103%-62%39%0%0%0%-85%73%68%65%84%8%-103%99%-8%15%4%91%61%94%-2%7%-125%57%-119%111%64%20%3%16%111%22%-13%-4%0%17%-36%40%28%-4%22%34%-72%85%-36%-27%49%68%-20%-1%-17%-123%66%-95%-17%64%-126%59%-60%44%54%-99%-127%-127%19%53%66%-31%-17%-2%51%-20%18%-77%-97%33%38%0%7%54%-45%4%35%-34%51%-56%40%63%124%-65%103%39%28%-100%-5%-35%-57%84%-49%16%-64%-65%-14%108%-80%47%28%84%62%13%18%-34%-64%-16%-50%91%-96%-36%-41%11%14%-94%-4%-124%22%3%45%122%-25%37%-72%-26%47%-44%-10%-1%-81%-62%4%23%-126%-99%-12%-42%67%112%29%84%-12%77%-104%-64%66%-88%-29%-33%-70%75%60%-123%8%-74%9%-52%-121%-7%-24%-1%-5%13%-33%33%-126%-41%15%-128%41%0%-105%3%-94%-119%-59%-55%85%100%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TLgoYVyXEeGSFubOzJOnSg" source="image_papyrus"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TLgoYlyXEeGSFubOzJOnSg" key="image_kind_key" value="icon"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TLgoY1yXEeGSFubOzJOnSg" key="image_name_key" value="conn"/> </eAnnotations> </icon> </packagedElement> @@ -220,7 +217,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_GENVkMtuEd2H_o0jIC6qDQ" name="extension_FCM_Connector" type="_JWD9UMttEd2H_o0jIC6qDQ" aggregation="composite" association="_F_vFQMtuEd2H_o0jIC6qDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_L8b3wMtvEd2H_o0jIC6qDQ" name="ConfigurationProperty"> - <ownedAttribute xmi:id="_SrYcAMtvEd2H_o0jIC6qDQ" name="base_Property" isUnique="false" association="_Sn9UkMtvEd2H_o0jIC6qDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_SrYcAMtvEd2H_o0jIC6qDQ" name="base_Property" isUnique="false" association="_Sn9UkMtvEd2H_o0jIC6qDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> </packagedElement> @@ -228,37 +225,37 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_SrOrAMtvEd2H_o0jIC6qDQ" name="extension_ConfigurationProperty" type="_L8b3wMtvEd2H_o0jIC6qDQ" aggregation="composite" association="_Sn9UkMtvEd2H_o0jIC6qDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_d1T90MtvEd2H_o0jIC6qDQ" name="ConfigurableElementInstance" isAbstract="true"> - <ownedAttribute xmi:id="_lARBIOLzEd2hC_i8ZB1Yiw" name="configuration" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_lARBIOLzEd2hC_i8ZB1Yiw" name="configuration" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_paWm0OLzEd2hC_i8ZB1Yiw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_paWm0eLzEd2hC_i8ZB1Yiw" value="1"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_5XyRUFLoEd6rYflXebIz1g" name="DeploymentPlan"> - <ownedAttribute xmi:id="_E2MOUFLpEd6rYflXebIz1g" name="mainInstance" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_E2MOUFLpEd6rYflXebIz1g" name="mainInstance" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/> </ownedAttribute> - <ownedAttribute xmi:id="_ecD1QFLpEd6rYflXebIz1g" name="base_Package" isUnique="false" association="_eamcsFLpEd6rYflXebIz1g"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ecD1QFLpEd6rYflXebIz1g" name="base_Package" isUnique="false" association="_eamcsFLpEd6rYflXebIz1g"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_BOnDoFLpEd6rYflXebIz1g" name="Template"> - <ownedAttribute xmi:id="_W5NH0FLpEd6rYflXebIz1g" name="templateParams" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_W5NH0FLpEd6rYflXebIz1g" name="templateParams" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZHrGADTvEd-aL8GNXYXa-Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZHzB0DTvEd-aL8GNXYXa-Q" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_hEi6cFLpEd6rYflXebIz1g" name="base_Element" isUnique="false" association="_hC4tkFLpEd6rYflXebIz1g"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_hEi6cFLpEd6rYflXebIz1g" name="base_Element" isUnique="false" association="_hC4tkFLpEd6rYflXebIz1g"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> </ownedAttribute> - <ownedAttribute xmi:id="_aPnHoAswEd-UGs2QNFrwPw" name="kind" visibility="public" type="_HSVlUAswEd-UGs2QNFrwPw" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_aPnHoAswEd-UGs2QNFrwPw" name="kind" visibility="public" type="_HSVlUAswEd-UGs2QNFrwPw" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fFnNQAswEd-UGs2QNFrwPw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fFt68AswEd-UGs2QNFrwPw" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_fF1PsAswEd-UGs2QNFrwPw"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_AAI-UObPEd-oHsJhS1620Q" name="actualChoice" visibility="public" type="_jnxwsObFEd-oHsJhS1620Q" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_AAI-UObPEd-oHsJhS1620Q" name="actualChoice" visibility="public" type="_jnxwsObFEd-oHsJhS1620Q" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GdgDUObPEd-oHsJhS1620Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gdh4gObPEd-oHsJhS1620Q" value="1"/> </ownedAttribute> @@ -270,10 +267,10 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hEf3IFLpEd6rYflXebIz1g" name="extension_Operation" type="_BOnDoFLpEd6rYflXebIz1g" aggregation="composite" association="_hC4tkFLpEd6rYflXebIz1g"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_6B80EGV9Ed6b6erIXzmEEA" name="DerivedElement"> - <ownedAttribute xmi:id="_iIYhcGV-Ed6b6erIXzmEEA" name="base_Element" isUnique="false" association="_iAkpQGV-Ed6b6erIXzmEEA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_iIYhcGV-Ed6b6erIXzmEEA" name="base_Element" isUnique="false" association="_iAkpQGV-Ed6b6erIXzmEEA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> </ownedAttribute> - <ownedAttribute xmi:id="_km8OkGV-Ed6b6erIXzmEEA" name="source" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_km8OkGV-Ed6b6erIXzmEEA" name="source" visibility="public" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_urcZYGV-Ed6b6erIXzmEEA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_urgDwGV-Ed6b6erIXzmEEA" value="1"/> @@ -286,12 +283,12 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_iIRMsGV-Ed6b6erIXzmEEA" name="extension_DerivedElement" type="_6B80EGV9Ed6b6erIXzmEEA" aggregation="composite" association="_iAkpQGV-Ed6b6erIXzmEEA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_2p6j0MnvEd6fKfvcq7rbxA" name="CompImplTemplate"> - <ownedAttribute xmi:id="_BHXU4MrGEd6fKfvcq7rbxA" name="templateDefs" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_BHXU4MrGEd6fKfvcq7rbxA" name="templateDefs" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BHXU4srGEd6fKfvcq7rbxA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BHXU4crGEd6fKfvcq7rbxA" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_JA8kYM30Ed6fKfvcq7rbxA" name="base_Class" isUnique="false" association="_I4YeQM30Ed6fKfvcq7rbxA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_JA8kYM30Ed6fKfvcq7rbxA" name="base_Class" isUnique="false" association="_I4YeQM30Ed6fKfvcq7rbxA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -299,14 +296,14 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_JA46AM30Ed6fKfvcq7rbxA" name="extension_CompImplTemplate" type="_2p6j0MnvEd6fKfvcq7rbxA" aggregation="composite" association="_I4YeQM30Ed6fKfvcq7rbxA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_5SI38AAhEd-0dMgailnZgA" name="ContainerRule"> - <ownedAttribute xmi:id="_s9dIUAAjEd-0dMgailnZgA" name="base_Class" isUnique="false" association="_s6giAAAjEd-0dMgailnZgA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_s9dIUAAjEd-0dMgailnZgA" name="base_Class" isUnique="false" association="_s6giAAAjEd-0dMgailnZgA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_fqiIwHPqEd-XO5WB9B_TDA" name="forConfig" type="_JSKpIHiLEd-iNcV8QPhhiQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_fqiIwHPqEd-XO5WB9B_TDA" name="forConfig" type="_JSKpIHiLEd-iNcV8QPhhiQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__IhDgHPzEd-J3uX_5f8M-A"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__IqNcHPzEd-J3uX_5f8M-A" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_BvGEwCm_EeKgOdm6HirHfA" name="kind" visibility="public" type="_FFvQcCm_EeKgOdm6HirHfA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_BvGEwCm_EeKgOdm6HirHfA" name="kind" visibility="public" type="_FFvQcCm_EeKgOdm6HirHfA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EJkjICm_EeKgOdm6HirHfA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EJnmcCm_EeKgOdm6HirHfA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_EJuUICm_EeKgOdm6HirHfA"> @@ -315,27 +312,27 @@ of a particular PortKind). Further experiments are still needed to confirm that </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_-ZqycAAhEd-0dMgailnZgA" name="InterceptionKind"> - <ownedLiteral xmi:id="__5IaEAAhEd-0dMgailnZgA" name="InterceptSome"/> - <ownedLiteral xmi:id="_ABWh8AAiEd-0dMgailnZgA" name="InterceptAll"/> - <ownedLiteral xmi:id="_uah8gJDtEd-I9dVdNhZAGQ" name="InterceptAllOut"/> - <ownedLiteral xmi:id="_w6U_wJDtEd-I9dVdNhZAGQ" name="InterceptAllIn"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__5IaEAAhEd-0dMgailnZgA" name="InterceptSome"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ABWh8AAiEd-0dMgailnZgA" name="InterceptAll"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_uah8gJDtEd-I9dVdNhZAGQ" name="InterceptAllOut"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_w6U_wJDtEd-I9dVdNhZAGQ" name="InterceptAllIn"/> </packagedElement> <packagedElement xmi:type="uml:Extension" xmi:id="_s6giAAAjEd-0dMgailnZgA" name="E_ContainerRule_Class0" memberEnd="_s9YP0AAjEd-0dMgailnZgA _s9dIUAAjEd-0dMgailnZgA"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_s9YP0AAjEd-0dMgailnZgA" name="extension_ContainerRule" type="_5SI38AAhEd-0dMgailnZgA" aggregation="composite" association="_s6giAAAjEd-0dMgailnZgA"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_HSVlUAswEd-UGs2QNFrwPw" name="TemplateKind"> - <ownedLiteral xmi:id="_Mn7J8AswEd-UGs2QNFrwPw" name="PassFormal"/> - <ownedLiteral xmi:id="_NRzNYAswEd-UGs2QNFrwPw" name="LoopOperations"/> - <ownedLiteral xmi:id="_T3PQUAswEd-UGs2QNFrwPw" name="LoopProperty"/> - <ownedLiteral xmi:id="_Ub5RUDNYEd-t359GOtEoBQ" name="Accumulate"/> - <ownedLiteral xmi:id="_3YQuwDNyEd-l9qP5D2-iXA" name="LoopLiterals"/> - <ownedLiteral xmi:id="_zZEPQDR4Ed-aL8GNXYXa-Q" name="LateEvaluation"/> - <ownedLiteral xmi:id="_p-jDYOhjEd-oHsJhS1620Q" name="LoopPorts"/> - <ownedLiteral xmi:id="_8n-OADWzEeKiyvmIR-KbrA" name="PassClassifier"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Mn7J8AswEd-UGs2QNFrwPw" name="PassFormal"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NRzNYAswEd-UGs2QNFrwPw" name="LoopOperations"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_T3PQUAswEd-UGs2QNFrwPw" name="LoopProperty"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Ub5RUDNYEd-t359GOtEoBQ" name="Accumulate"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3YQuwDNyEd-l9qP5D2-iXA" name="LoopLiterals"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zZEPQDR4Ed-aL8GNXYXa-Q" name="LateEvaluation"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_p-jDYOhjEd-oHsJhS1620Q" name="LoopPorts"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8n-OADWzEeKiyvmIR-KbrA" name="PassClassifier"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_LXr4ICI8Ed-Vp7msgJA8uw" name="CppLibrary"> - <generalization xmi:id="_qdW2UFaXEd-w9f5DG2hQCA" general="_jTOK4FaXEd-w9f5DG2hQCA"/> - <ownedAttribute xmi:id="_t06A8FaXEd-w9f5DG2hQCA" name="macros" visibility="public" isUnique="false"> + <generalization xmi:type="uml:Generalization" xmi:id="_qdW2UFaXEd-w9f5DG2hQCA" general="_jTOK4FaXEd-w9f5DG2hQCA"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_t06A8FaXEd-w9f5DG2hQCA" name="macros" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3BtuwFaXEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3B1qkFaXEd-w9f5DG2hQCA" value="*"/> @@ -343,7 +340,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_xMx7sFaXEd-w9f5DG2hQCA" name="libs" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_xMx7sFaXEd-w9f5DG2hQCA" name="libs" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6O5ccFaXEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6PEbkFaXEd-w9f5DG2hQCA" value="*"/> @@ -351,7 +348,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_x9PIQFaXEd-w9f5DG2hQCA" name="libPaths" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_x9PIQFaXEd-w9f5DG2hQCA" name="libPaths" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7g_WcFaXEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7hNY4FaXEd-w9f5DG2hQCA" value="*"/> @@ -359,7 +356,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_GcLP4JWJEd-xqrYFQVL_qg" name="includePaths" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_GcLP4JWJEd-xqrYFQVL_qg" name="includePaths" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JB6jEJWJEd-xqrYFQVL_qg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JCJzoJWJEd-xqrYFQVL_qg" value="*"/> @@ -369,12 +366,12 @@ of a particular PortKind). Further experiments are still needed to confirm that </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_aQTf0FSdEd-w9f5DG2hQCA" name="ImplementationGroup"> - <ownedAttribute xmi:id="_5OkHcEzuEeG_JK8KIEXPxQ" name="base_Class" association="_5OkugEzuEeG_JK8KIEXPxQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_5OkHcEzuEeG_JK8KIEXPxQ" name="base_Class" association="_5OkugEzuEeG_JK8KIEXPxQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_jTOK4FaXEd-w9f5DG2hQCA" name="ExternalLibrary"> - <ownedAttribute xmi:id="_pe5qAFaXEd-w9f5DG2hQCA" name="base_Package" isUnique="false" association="_pXBgYFaXEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_pe5qAFaXEd-w9f5DG2hQCA" name="base_Package" isUnique="false" association="_pXBgYFaXEd-w9f5DG2hQCA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </ownedAttribute> </packagedElement> @@ -382,8 +379,8 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_pe0xgFaXEd-w9f5DG2hQCA" name="extension_ExtLibrary" type="_jTOK4FaXEd-w9f5DG2hQCA" aggregation="composite" association="_pXBgYFaXEd-w9f5DG2hQCA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_r6WYwFaXEd-w9f5DG2hQCA" name="JavaLibrary"> - <generalization xmi:id="_FLQcUFaYEd-w9f5DG2hQCA" general="_jTOK4FaXEd-w9f5DG2hQCA"/> - <ownedAttribute xmi:id="_0dFO0FaXEd-w9f5DG2hQCA" name="classPath" visibility="public" isUnique="false"> + <generalization xmi:type="uml:Generalization" xmi:id="_FLQcUFaYEd-w9f5DG2hQCA" general="_jTOK4FaXEd-w9f5DG2hQCA"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_0dFO0FaXEd-w9f5DG2hQCA" name="classPath" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-f2UQFaXEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-gDIkFaXEd-w9f5DG2hQCA" value="*"/> @@ -393,24 +390,24 @@ of a particular PortKind). Further experiments are still needed to confirm that </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_ZF8ZYFapEd-w9f5DG2hQCA" name="ImplementationProperties"> - <ownedAttribute xmi:id="_b5KH4FapEd-w9f5DG2hQCA" name="sizeRAM" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_b5KH4FapEd-w9f5DG2hQCA" name="sizeRAM" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> </ownedAttribute> - <ownedAttribute xmi:id="_jmeY4FapEd-w9f5DG2hQCA" name="supportedOS" type="_1rKtYFapEd-w9f5DG2hQCA" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_jmeY4FapEd-w9f5DG2hQCA" name="supportedOS" type="_1rKtYFapEd-w9f5DG2hQCA" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UskI4FaqEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UswWIFaqEd-w9f5DG2hQCA" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_o1UcUFapEd-w9f5DG2hQCA" name="arch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_o1UcUFapEd-w9f5DG2hQCA" name="arch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VVslcFaqEd-w9f5DG2hQCA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VV4LoFaqEd-w9f5DG2hQCA" value="*"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_TstOYFaqEd-w9f5DG2hQCA"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_40nNwFatEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_4mq4YFatEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_40nNwFatEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_4mq4YFatEd-w9f5DG2hQCA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_Mt6wwJOGEd-5qPBhYeIVtw" name="sizeROM" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_Mt6wwJOGEd-5qPBhYeIVtw" name="sizeROM" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OdIEkJOGEd-5qPBhYeIVtw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OdNkIJOGEd-5qPBhYeIVtw" value="1"/> @@ -418,7 +415,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_TJXKMJOGEd-5qPBhYeIVtw" name="supportedTargetArch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_TJXKMJOGEd-5qPBhYeIVtw" name="supportedTargetArch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VGIY4JOGEd-5qPBhYeIVtw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGYQgJOGEd-5qPBhYeIVtw" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_VGdwEJOGEd-5qPBhYeIVtw"> @@ -426,16 +423,13 @@ of a particular PortKind). Further experiments are still needed to confirm that </defaultValue> </ownedAttribute> </packagedElement> - <packagedElement xmi:type="uml:Extension" xmi:id="_SjDSoCI8Ed-Vp7msgJA8uw" name="Extension_CompilationReq" memberEnd="_Sl5yUCI8Ed-Vp7msgJA8uw"> - <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Sl5yUCI8Ed-Vp7msgJA8uw" name="extension_CompilationReq" type="_LXr4ICI8Ed-Vp7msgJA8uw" aggregation="composite" association="_SjDSoCI8Ed-Vp7msgJA8uw"/> - </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_1rKtYFapEd-w9f5DG2hQCA" name="OperatingSystem"> - <ownedAttribute xmi:id="_747QIFapEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_7yep4FapEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_747QIFapEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_7yep4FapEd-w9f5DG2hQCA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_361C4FapEd-w9f5DG2hQCA" name="TargetArchitecture"> - <ownedAttribute xmi:id="_-qs0MFapEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_-jKo0FapEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_-qs0MFapEd-w9f5DG2hQCA" name="base_Class" isUnique="false" association="_-jKo0FapEd-w9f5DG2hQCA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -449,14 +443,14 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_40hHIFatEd-w9f5DG2hQCA" name="extension_ImplementationProperties" type="_ZF8ZYFapEd-w9f5DG2hQCA" aggregation="composite" association="_4mq4YFatEd-w9f5DG2hQCA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_E0tzcGE_Ed-eArNXja7SuA" name="Configuration"> - <ownedAttribute xmi:id="_bkF6EHWmEd-EI-xpxehsbA" name="base_Class" association="_bkIWUHWmEd-EI-xpxehsbA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_bkF6EHWmEd-EI-xpxehsbA" name="base_Class" association="_bkIWUHWmEd-EI-xpxehsbA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_zqH8AH8UEd-oF-y8FyT5sA" name="configOptions" type="_JSKpIHiLEd-iNcV8QPhhiQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_zqH8AH8UEd-oF-y8FyT5sA" name="configOptions" type="_JSKpIHiLEd-iNcV8QPhhiQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4507EH8UEd-oF-y8FyT5sA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_452wQH8UEd-oF-y8FyT5sA" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_Fi5eoJQBEd-UMN59oR7XbA" name="deploymentPlan" visibility="public" type="_5XyRUFLoEd6rYflXebIz1g"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_Fi5eoJQBEd-UMN59oR7XbA" name="deploymentPlan" visibility="public" type="_5XyRUFLoEd6rYflXebIz1g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IgppMJQBEd-UMN59oR7XbA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IgzaMJQBEd-UMN59oR7XbA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ig3roJQBEd-UMN59oR7XbA"> @@ -468,7 +462,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_bkIWUXWmEd-EI-xpxehsbA" name="extension_Configuration" type="_E0tzcGE_Ed-eArNXja7SuA" aggregation="composite" association="_bkIWUHWmEd-EI-xpxehsbA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_JSKpIHiLEd-iNcV8QPhhiQ" name="ConfigOption"> - <ownedAttribute xmi:id="_b6bEEHiTEd-iNcV8QPhhiQ" name="base_Class" association="_b6cSMHiTEd-iNcV8QPhhiQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_b6bEEHiTEd-iNcV8QPhhiQ" name="base_Class" association="_b6cSMHiTEd-iNcV8QPhhiQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -476,14 +470,14 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_b6cSMXiTEd-iNcV8QPhhiQ" name="extension_ConfigOption" type="_JSKpIHiLEd-iNcV8QPhhiQ" aggregation="composite" association="_b6cSMHiTEd-iNcV8QPhhiQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_JWyAMJDxEd-I9dVdNhZAGQ" name="InterceptionRule"> - <ownedAttribute xmi:id="_JZaBAAAjEd-0dMgailnZgA" name="interceptionKind" visibility="public" type="_-ZqycAAhEd-0dMgailnZgA" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_JZaBAAAjEd-0dMgailnZgA" name="interceptionKind" visibility="public" type="_-ZqycAAhEd-0dMgailnZgA" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MIadkAAmEd-0dMgailnZgA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MIcSwAAmEd-0dMgailnZgA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_KFrZsPS3EeCLI_ythlfGJw"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_3SMAIAAmEd-0dMgailnZgA" name="interceptionSet" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_3SMAIAAmEd-0dMgailnZgA" name="interceptionSet" visibility="public" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uqZjkAApEd-0dMgailnZgA"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uqkisAApEd-0dMgailnZgA" value="*"/> @@ -491,39 +485,39 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_QnaoYPS3EeCLI_ythlfGJw" name="base_Property" association="_Qnb2gPS3EeCLI_ythlfGJw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_QnaoYPS3EeCLI_ythlfGJw" name="base_Property" association="_Qnb2gPS3EeCLI_ythlfGJw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> - <ownedAttribute xmi:id="_gEEhcCq3EeKWMcuhL1C5sA" name="base_Operation" association="_gEFvkCq3EeKWMcuhL1C5sA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_gEEhcCq3EeKWMcuhL1C5sA" name="base_Operation" association="_gEFvkCq3EeKWMcuhL1C5sA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_0KEH0JOCEd-5qPBhYeIVtw" name="Target"> - <ownedAttribute xmi:id="__5rAUGE_Ed-eArNXja7SuA" name="targetArch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="__5rAUGE_Ed-eArNXja7SuA" name="targetArch" visibility="public" type="_361C4FapEd-w9f5DG2hQCA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Glq-QGFAEd-eArNXja7SuA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GlszcGFAEd-eArNXja7SuA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_GltagGFAEd-eArNXja7SuA"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_C5WBYGGLEd-yH9S4VNNbSQ" name="options" visibility="public" type="_JSKpIHiLEd-iNcV8QPhhiQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_C5WBYGGLEd-yH9S4VNNbSQ" name="options" visibility="public" type="_JSKpIHiLEd-iNcV8QPhhiQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FGz-gGGLEd-yH9S4VNNbSQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FG1MoGGLEd-yH9S4VNNbSQ" value="*"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_FG1zsGGLEd-yH9S4VNNbSQ"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_biZZEJODEd-5qPBhYeIVtw" name="base_Node" association="_biaAIJODEd-5qPBhYeIVtw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_biZZEJODEd-5qPBhYeIVtw" name="base_Node" association="_biaAIJODEd-5qPBhYeIVtw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Node"/> </ownedAttribute> - <ownedAttribute xmi:id="_BZCjMJOGEd-5qPBhYeIVtw" name="usedOS" visibility="public" type="_1rKtYFapEd-w9f5DG2hQCA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_BZCjMJOGEd-5qPBhYeIVtw" name="usedOS" visibility="public" type="_1rKtYFapEd-w9f5DG2hQCA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E7f9UJOGEd-5qPBhYeIVtw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E7nSEJOGEd-5qPBhYeIVtw" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_E7qVYJOGEd-5qPBhYeIVtw"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_D-cckJPxEd-UMN59oR7XbA" name="availRAM" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_D-cckJPxEd-UMN59oR7XbA" name="availRAM" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GX4ZIJPxEd-UMN59oR7XbA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GX8DgJPxEd-UMN59oR7XbA" value="1"/> @@ -531,7 +525,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_HtMmQJPxEd-UMN59oR7XbA" name="availROM" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_HtMmQJPxEd-UMN59oR7XbA" name="availROM" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JzMpcJPxEd-UMN59oR7XbA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jzar4JPxEd-UMN59oR7XbA" value="1"/> @@ -544,10 +538,10 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_biaAIZODEd-5qPBhYeIVtw" name="extension_Target" type="_0KEH0JOCEd-5qPBhYeIVtw" aggregation="composite" association="_biaAIJODEd-5qPBhYeIVtw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_maLdwLCJEd-D5aqfqbr7IQ" name="Part"> - <ownedAttribute xmi:id="_5QeOULCJEd-D5aqfqbr7IQ" name="base_Property" association="_5QfccLCJEd-D5aqfqbr7IQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_5QeOULCJEd-D5aqfqbr7IQ" name="base_Property" association="_5QfccLCJEd-D5aqfqbr7IQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> - <ownedAttribute xmi:id="_7dGd8LCJEd-D5aqfqbr7IQ" name="colocateWithPort" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_7dGd8LCJEd-D5aqfqbr7IQ" name="colocateWithPort" visibility="public"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8Xu6MLCJEd-D5aqfqbr7IQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8X2O8LCJEd-D5aqfqbr7IQ" value="*"/> @@ -557,12 +551,12 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_5QfccbCJEd-D5aqfqbr7IQ" name="extension_Part" type="_maLdwLCJEd-D5aqfqbr7IQ" aggregation="composite" association="_5QfccLCJEd-D5aqfqbr7IQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_QiSSgLCLEd-D5aqfqbr7IQ" name="CopyAttributeValue"> - <ownedAttribute xmi:id="_fBzQELCLEd-D5aqfqbr7IQ" name="source" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_fBzQELCLEd-D5aqfqbr7IQ" name="source" visibility="public"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fo4eMLCLEd-D5aqfqbr7IQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fpDdULCLEd-D5aqfqbr7IQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_j0uzkLCLEd-D5aqfqbr7IQ" name="base_Property" association="_j0vaoLCLEd-D5aqfqbr7IQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_j0uzkLCLEd-D5aqfqbr7IQ" name="base_Property" association="_j0vaoLCLEd-D5aqfqbr7IQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> </packagedElement> @@ -570,28 +564,28 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_j0vaobCLEd-D5aqfqbr7IQ" name="extension_CopyAttributeValue" type="_QiSSgLCLEd-D5aqfqbr7IQ" aggregation="composite" association="_j0vaoLCLEd-D5aqfqbr7IQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_7yDdYLFREd-D5aqfqbr7IQ" name="AutoIndex"> - <ownedAttribute xmi:id="_IpRAYLFSEd-D5aqfqbr7IQ" name="base_Property" association="_IpRncLFSEd-D5aqfqbr7IQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_IpRAYLFSEd-D5aqfqbr7IQ" name="base_Property" association="_IpRncLFSEd-D5aqfqbr7IQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_CRCTALFSEd-D5aqfqbr7IQ" name="AutoIndexPerNode"> - <generalization xmi:id="_ElzyALFSEd-D5aqfqbr7IQ" general="_7yDdYLFREd-D5aqfqbr7IQ"/> + <generalization xmi:type="uml:Generalization" xmi:id="_ElzyALFSEd-D5aqfqbr7IQ" general="_7yDdYLFREd-D5aqfqbr7IQ"/> </packagedElement> <packagedElement xmi:type="uml:Extension" xmi:id="_IpRncLFSEd-D5aqfqbr7IQ" name="E_autoIndex_Property0" memberEnd="_IpRncbFSEd-D5aqfqbr7IQ _IpRAYLFSEd-D5aqfqbr7IQ"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_IpRncbFSEd-D5aqfqbr7IQ" name="extension_AutoIndex" type="_7yDdYLFREd-D5aqfqbr7IQ" aggregation="composite" association="_IpRncLFSEd-D5aqfqbr7IQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_8t77ULc6Ed-kAZ42Z8lTBg" name="InitPrecedence"> - <ownedAttribute xmi:id="_JZGmYLc7Ed-kAZ42Z8lTBg" name="invokeAfter" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_JZGmYLc7Ed-kAZ42Z8lTBg" name="invokeAfter" visibility="public" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JsHB8Lc7Ed-kAZ42Z8lTBg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JsJeMLc7Ed-kAZ42Z8lTBg" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_SX8JoLc7Ed-kAZ42Z8lTBg" name="invokeBefore" visibility="public" isUnique="false"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_SX8JoLc7Ed-kAZ42Z8lTBg" name="invokeBefore" visibility="public" isUnique="false"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VVT5sLc7Ed-kAZ42Z8lTBg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VXUE0Lc7Ed-kAZ42Z8lTBg" value="*"/> </ownedAttribute> - <ownedAttribute xmi:id="_szpzcLc7Ed-kAZ42Z8lTBg" name="base_Class" association="_szqagLc7Ed-kAZ42Z8lTBg"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_szpzcLc7Ed-kAZ42Z8lTBg" name="base_Class" association="_szqagLc7Ed-kAZ42Z8lTBg"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -599,10 +593,10 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_szqagbc7Ed-kAZ42Z8lTBg" name="extension_InitPrecedence" type="_8t77ULc6Ed-kAZ42Z8lTBg" aggregation="composite" association="_szqagLc7Ed-kAZ42Z8lTBg"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_mditANXnEd-CUqOXH3INsw" name="ConnectorConfiguration"> - <ownedAttribute xmi:id="_ZfQikNXwEd-CUqOXH3INsw" name="base_Slot" association="_ZfRJoNXwEd-CUqOXH3INsw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ZfQikNXwEd-CUqOXH3INsw" name="base_Slot" association="_ZfRJoNXwEd-CUqOXH3INsw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Slot"/> </ownedAttribute> - <ownedAttribute xmi:id="_16-VQNXwEd-CUqOXH3INsw" name="connector" visibility="public" type="_JWD9UMttEd2H_o0jIC6qDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_16-VQNXwEd-CUqOXH3INsw" name="connector" visibility="public" type="_JWD9UMttEd2H_o0jIC6qDQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_694OcNXwEd-CUqOXH3INsw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6-J7QNXwEd-CUqOXH3INsw" value="1"/> </ownedAttribute> @@ -611,15 +605,15 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZfRJodXwEd-CUqOXH3INsw" name="extension_ConnectorConfiguration" type="_mditANXnEd-CUqOXH3INsw" aggregation="composite" association="_ZfRJoNXwEd-CUqOXH3INsw"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_jnxwsObFEd-oHsJhS1620Q" name="ActualChoice"> - <ownedLiteral xmi:id="_udxp4ObFEd-oHsJhS1620Q" name="PassActual"/> - <ownedLiteral xmi:id="_vSnAIObFEd-oHsJhS1620Q" name="InterfaceOfPPort"/> - <ownedLiteral xmi:id="_6qjZsObOEd-oHsJhS1620Q" name="InterfaceOfRport"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_udxp4ObFEd-oHsJhS1620Q" name="PassActual"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_vSnAIObFEd-oHsJhS1620Q" name="InterfaceOfPPort"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6qjZsObOEd-oHsJhS1620Q" name="InterfaceOfRport"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_UsmDYPPBEd-Tz5tQ_F9baw" name="ExtendedSignature"> - <ownedAttribute xmi:id="_ZiQx0PPBEd-Tz5tQ_F9baw" name="base_TemplateSignature" association="_ZiRY4PPBEd-Tz5tQ_F9baw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ZiQx0PPBEd-Tz5tQ_F9baw" name="base_TemplateSignature" association="_ZiRY4PPBEd-Tz5tQ_F9baw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/> </ownedAttribute> - <ownedAttribute xmi:id="_cqIhsPPBEd-Tz5tQ_F9baw" name="baseSignature"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_cqIhsPPBEd-Tz5tQ_F9baw" name="baseSignature"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/> </ownedAttribute> </packagedElement> @@ -627,13 +621,13 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZiRY4fPBEd-Tz5tQ_F9baw" name="extension_ExtendedSignature" type="_UsmDYPPBEd-Tz5tQ_F9baw" aggregation="composite" association="_ZiRY4PPBEd-Tz5tQ_F9baw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_KBrOsDyEEeCYGtteoBz6vQ" name="ContainerPort"> - <generalization xmi:id="_OUdSgDyEEeCYGtteoBz6vQ" general="_pP-ckMtqEd2H_o0jIC6qDQ"/> + <generalization xmi:type="uml:Generalization" xmi:id="_OUdSgDyEEeCYGtteoBz6vQ" general="_pP-ckMtqEd2H_o0jIC6qDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_beqmAEZ0EeCLCJBkU67iDQ" name="UseInstanceConfigurator"> - <ownedAttribute xmi:id="_ejisQEZ0EeCLCJBkU67iDQ" name="base_Class" association="_ejj6YEZ0EeCLCJBkU67iDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_ejisQEZ0EeCLCJBkU67iDQ" name="base_Class" association="_ejj6YEZ0EeCLCJBkU67iDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> - <ownedAttribute xmi:id="_vkwxkEZ0EeCLCJBkU67iDQ" name="configurator" visibility="public" type="_kDGFMEZ0EeCLCJBkU67iDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_vkwxkEZ0EeCLCJBkU67iDQ" name="configurator" visibility="public" type="_kDGFMEZ0EeCLCJBkU67iDQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x906sEZ0EeCLCJBkU67iDQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x-ozAEZ0EeCLCJBkU67iDQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_yA41wEZ0EeCLCJBkU67iDQ"> @@ -645,7 +639,7 @@ of a particular PortKind). Further experiments are still needed to confirm that <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ejj6YUZ0EeCLCJBkU67iDQ" name="extension_UseInstanceConfigurator" type="_beqmAEZ0EeCLCJBkU67iDQ" aggregation="composite" association="_ejj6YEZ0EeCLCJBkU67iDQ"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_kDGFMEZ0EeCLCJBkU67iDQ" name="InstanceConfigurator"> - <ownedAttribute xmi:id="_rsCMgEZ0EeCLCJBkU67iDQ" name="base_Class" association="_rsCMgUZ0EeCLCJBkU67iDQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_rsCMgEZ0EeCLCJBkU67iDQ" name="base_Class" association="_rsCMgUZ0EeCLCJBkU67iDQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -664,27 +658,21 @@ of a particular PortKind). Further experiments are still needed to confirm that <packagedElement xmi:type="uml:Extension" xmi:id="_Bo7rsUzvEeG_JK8KIEXPxQ" name="E_Singleton_Class2" memberEnd="_Bo7rskzvEeG_JK8KIEXPxQ _Bo7rsEzvEeG_JK8KIEXPxQ"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Bo7rskzvEeG_JK8KIEXPxQ" name="extension_Singleton" type="_zjaC8MtkEd2H_o0jIC6qDQ" aggregation="composite" association="_Bo7rsUzvEeG_JK8KIEXPxQ"/> </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_Kjk2AEzwEeG_JK8KIEXPxQ" name="implementationGroup_class_1" memberEnd="_Kjk2AUzwEeG_JK8KIEXPxQ"> - <ownedEnd xmi:id="_Kjk2AUzwEeG_JK8KIEXPxQ" name="implementationGroup" type="_aQTf0FSdEd-w9f5DG2hQCA" association="_Kjk2AEzwEeG_JK8KIEXPxQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Kjk2A0zwEeG_JK8KIEXPxQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kjk2AkzwEeG_JK8KIEXPxQ" value="1"/> - </ownedEnd> - </packagedElement> <packagedElement xmi:type="uml:Extension" xmi:id="_DaA8UCNaEeKGuM7MKNu-KA" name="E_RuleApplication_Package1" memberEnd="_DaA8USNaEeKGuM7MKNu-KA _DZQuYCNaEeKGuM7MKNu-KA"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DaA8USNaEeKGuM7MKNu-KA" name="extension_RuleApplication" type="_te7YAMtkEd2H_o0jIC6qDQ" aggregation="composite" association="_DaA8UCNaEeKGuM7MKNu-KA"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_FFvQcCm_EeKgOdm6HirHfA" name="ContainerRuleKind"> - <ownedLiteral xmi:id="_GMSBwCm_EeKgOdm6HirHfA" name="ComponentRule"/> - <ownedLiteral xmi:id="_HsIq8Cm_EeKgOdm6HirHfA" name="LightWeightOORule"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_GMSBwCm_EeKgOdm6HirHfA" name="ComponentRule"/> + <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HsIq8Cm_EeKgOdm6HirHfA" name="LightWeightOORule"/> </packagedElement> <packagedElement xmi:type="uml:Extension" xmi:id="_gEFvkCq3EeKWMcuhL1C5sA" name="E_InterceptionRule_Operation1" memberEnd="_gEFvkSq3EeKWMcuhL1C5sA _gEEhcCq3EeKWMcuhL1C5sA"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_gEFvkSq3EeKWMcuhL1C5sA" name="extension_InterceptionRule" type="_JWyAMJDxEd-I9dVdNhZAGQ" aggregation="composite" association="_gEFvkCq3EeKWMcuhL1C5sA"/> </packagedElement> - <profileApplication xmi:id="_aTo0UC27Ed6q9cO948d5Fw"> - <eAnnotations xmi:id="_aa7vIC27Ed6q9cO948d5Fw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_aTo0UC27Ed6q9cO948d5Fw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aa7vIC27Ed6q9cO948d5Fw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/> </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> </profileApplication> </uml:Profile> <Ecore:EPackage xmi:id="_bIrl8C27Ed6q9cO948d5Fw" base_Package="_5mvT0MtjEd2H_o0jIC6qDQ" packageName="FCM" nsPrefix="FCM" nsURI="http://www.eclipse.org/papyrus/FCM/1" prefix="FCM"/> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml index 0a1c645a7c9..3d535ba6e19 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml @@ -18,6 +18,13 @@ class = "org.eclipse.papyrus.FCM.FCMPackage"
genModel = "model/FCM.genmodel"/>
</extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated FCM -->
+ <parser
+ type="fcm"
+ class="org.eclipse.papyrus.FCM.util.FCMResourceFactoryImpl"/>
+ </extension>
<extension point="org.eclipse.uml2.uml.generated_package">
<profile
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java index 3373aaec652..1fc7b84c0d0 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java @@ -634,22 +634,13 @@ public interface FCMPackage extends EPackage { int PORT__REQUIRED_INTERFACE = CONFIGURABLE_ELEMENT_INSTANCE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Conjugated</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int PORT__CONJUGATED = CONFIGURABLE_ELEMENT_INSTANCE_FEATURE_COUNT + 4; - - /** * The number of structural features of the '<em>Port</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PORT_FEATURE_COUNT = CONFIGURABLE_ELEMENT_INSTANCE_FEATURE_COUNT + 5; + int PORT_FEATURE_COUNT = CONFIGURABLE_ELEMENT_INSTANCE_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Configuration</b></em>' reference. @@ -1425,15 +1416,6 @@ public interface FCMPackage extends EPackage { int CONTAINER_PORT__REQUIRED_INTERFACE = PORT__REQUIRED_INTERFACE; /** - * The feature id for the '<em><b>Conjugated</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - int CONTAINER_PORT__CONJUGATED = PORT__CONJUGATED; - - /** * The number of structural features of the '<em>Container Port</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1699,17 +1681,6 @@ public interface FCMPackage extends EPackage { EReference getPort_RequiredInterface(); /** - * Returns the meta object for the attribute '{@link org.eclipse.papyrus.FCM.Port#isConjugated <em>Conjugated</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Conjugated</em>'. - * @see org.eclipse.papyrus.FCM.Port#isConjugated() - * @see #getPort() - * @generated - */ - EAttribute getPort_Conjugated(); - - /** * Returns the meta object for class '{@link org.eclipse.papyrus.FCM.ConfigurableElementInstance <em>Configurable Element Instance</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2926,14 +2897,6 @@ public interface FCMPackage extends EPackage { EReference PORT__REQUIRED_INTERFACE = eINSTANCE.getPort_RequiredInterface(); /** - * The meta object literal for the '<em><b>Conjugated</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - EAttribute PORT__CONJUGATED = eINSTANCE.getPort_Conjugated(); - - /** * The meta object literal for the '{@link org.eclipse.papyrus.FCM.impl.ConfigurableElementInstanceImpl <em>Configurable Element Instance</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java index 939733e671e..8f4cb63e130 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Port.java @@ -20,7 +20,6 @@ import org.eclipse.uml2.uml.Interface; * <li>{@link org.eclipse.papyrus.FCM.Port#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.FCM.Port#getProvidedInterface <em>Provided Interface</em>}</li> * <li>{@link org.eclipse.papyrus.FCM.Port#getRequiredInterface <em>Required Interface</em>}</li> - * <li>{@link org.eclipse.papyrus.FCM.Port#isConjugated <em>Conjugated</em>}</li> * </ul> * </p> * @@ -133,30 +132,4 @@ public interface Port extends ConfigurableElementInstance { */ boolean isSetRequiredInterface(); - /** - * Returns the value of the '<em><b>Conjugated</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Conjugated</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Conjugated</em>' attribute. - * @see #setConjugated(boolean) - * @see org.eclipse.papyrus.FCM.FCMPackage#getPort_Conjugated() - * @model unique="false" dataType="org.eclipse.uml2.types.Boolean" required="true" ordered="false" - * @generated - */ - boolean isConjugated(); - - /** - * Sets the value of the '{@link org.eclipse.papyrus.FCM.Port#isConjugated <em>Conjugated</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Conjugated</em>' attribute. - * @see #isConjugated() - * @generated - */ - void setConjugated(boolean value); - } // Port diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java index 71c724b0852..a8230f12d57 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java @@ -522,15 +522,6 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getPort_Conjugated() { - return (EAttribute)portEClass.getEStructuralFeatures().get(4); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public EClass getConfigurableElementInstance() { return configurableElementInstanceEClass; } @@ -1507,7 +1498,6 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage { createEReference(portEClass, PORT__KIND); createEReference(portEClass, PORT__PROVIDED_INTERFACE); createEReference(portEClass, PORT__REQUIRED_INTERFACE); - createEAttribute(portEClass, PORT__CONJUGATED); configurableElementInstanceEClass = createEClass(CONFIGURABLE_ELEMENT_INSTANCE); createEReference(configurableElementInstanceEClass, CONFIGURABLE_ELEMENT_INSTANCE__CONFIGURATION); @@ -1700,7 +1690,6 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage { initEReference(getPort_Kind(), this.getPortKind(), null, "kind", null, 0, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getPort_ProvidedInterface(), theUMLPackage.getInterface(), null, "providedInterface", null, 0, 1, Port.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); initEReference(getPort_RequiredInterface(), theUMLPackage.getInterface(), null, "requiredInterface", null, 0, 1, Port.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, !IS_UNIQUE, IS_DERIVED, !IS_ORDERED); - initEAttribute(getPort_Conjugated(), theTypesPackage.getBoolean(), "conjugated", null, 1, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(configurableElementInstanceEClass, ConfigurableElementInstance.class, "ConfigurableElementInstance", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getConfigurableElementInstance_Configuration(), theUMLPackage.getInstanceSpecification(), null, "configuration", null, 0, 1, ConfigurableElementInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java index be4f4a83f50..3fb2f3edf28 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/PortImpl.java @@ -32,7 +32,6 @@ import org.eclipse.uml2.uml.Stereotype; * <li>{@link org.eclipse.papyrus.FCM.impl.PortImpl#getKind <em>Kind</em>}</li> * <li>{@link org.eclipse.papyrus.FCM.impl.PortImpl#getProvidedInterface <em>Provided Interface</em>}</li> * <li>{@link org.eclipse.papyrus.FCM.impl.PortImpl#getRequiredInterface <em>Required Interface</em>}</li> - * <li>{@link org.eclipse.papyrus.FCM.impl.PortImpl#isConjugated <em>Conjugated</em>}</li> * </ul> * </p> * @@ -61,26 +60,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { protected PortKind kind; /** - * The default value of the '{@link #isConjugated() <em>Conjugated</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isConjugated() - * @generated - * @ordered - */ - protected static final boolean CONJUGATED_EDEFAULT = false; - - /** - * The cached value of the '{@link #isConjugated() <em>Conjugated</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isConjugated() - * @generated - * @ordered - */ - protected boolean conjugated = CONJUGATED_EDEFAULT; - - /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -192,7 +171,7 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { * @generated NOT */ public Interface basicGetProvidedInterface() { - if(conjugated) { + if(base_Port.isConjugated()) { return MapUtil.getRequiredInterface(this); } else { @@ -227,7 +206,7 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { * @generated NOT */ public Interface basicGetRequiredInterface() { - if(!conjugated) { + if(!base_Port.isConjugated()) { return MapUtil.getRequiredInterface(this); } else { @@ -250,27 +229,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { * <!-- end-user-doc --> * @generated */ - public boolean isConjugated() { - return conjugated; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setConjugated(boolean newConjugated) { - boolean oldConjugated = conjugated; - conjugated = newConjugated; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.PORT__CONJUGATED, oldConjugated, conjugated)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { @@ -286,8 +244,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { case FCMPackage.PORT__REQUIRED_INTERFACE: if (resolve) return getRequiredInterface(); return basicGetRequiredInterface(); - case FCMPackage.PORT__CONJUGATED: - return isConjugated(); } return super.eGet(featureID, resolve, coreType); } @@ -306,9 +262,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { case FCMPackage.PORT__KIND: setKind((PortKind)newValue); return; - case FCMPackage.PORT__CONJUGATED: - setConjugated((Boolean)newValue); - return; } super.eSet(featureID, newValue); } @@ -327,9 +280,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { case FCMPackage.PORT__KIND: setKind((PortKind)null); return; - case FCMPackage.PORT__CONJUGATED: - setConjugated(CONJUGATED_EDEFAULT); - return; } super.eUnset(featureID); } @@ -350,8 +300,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { return isSetProvidedInterface(); case FCMPackage.PORT__REQUIRED_INTERFACE: return isSetRequiredInterface(); - case FCMPackage.PORT__CONJUGATED: - return conjugated != CONJUGATED_EDEFAULT; } return super.eIsSet(featureID); } @@ -359,22 +307,6 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (conjugated: "); - result.append(conjugated); - result.append(')'); - return result.toString(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> * * @generated NOT */ static EList<Interface> emptyList = new BasicEList<Interface>(); @@ -390,7 +322,7 @@ public class PortImpl extends ConfigurableElementInstanceImpl implements Port { if(clazz instanceof Stereotype) { EList<Image> icons = ((Stereotype)clazz).getIcons(); - if(isConjugated()) { + if(base_Port.isConjugated()) { if(icons.size() > 1) { // standard position for conjugated icon return icons.get(1); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java index 809722f019a..0379205d0f1 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java @@ -143,8 +143,8 @@ public class MapUtil * Get a derived interface for a port using the convention that the interface name * is a concatenation (separated by parameter separation) of the port kind name and the type name. * - * @param kind - * the port kind + * @param port + * the port, for which we create the interface. Port (its kind attribute) is used to determine name * @param separation * separation string between kind and type name * @param type @@ -167,6 +167,8 @@ public class MapUtil * Get or create a derived interface for a port using a fixed prefix * type name * + * @param port + * The port?? * @param prefix * prefix string * @param type @@ -297,7 +299,7 @@ public class MapUtil else if(portKind.getBase_Class() != null) { String ruleName = portKind.isExtendedPort() ? "ExtendedPort" : portKind.getBase_Class().getName(); final IMappingRule mappingRule = getMappingRule(ruleName); - if(mappingRule != null) { + if((mappingRule != null) && (!calcRunning)) { // EList<Interface> temp = new EObjectEList<Interface>(Interface.class, (PortImpl) port, // FCMPackage.PORT__PROVIDED_INTERFACE); Runnable rule = new Runnable() { @@ -306,6 +308,8 @@ public class MapUtil intf = mappingRule.getProvided(port, port.getConfiguration()); } }; + calcRunning = true; + if((mappingRule.needsTransaction() == IMappingRule.BOTH) || (mappingRule.needsTransaction() == IMappingRule.PROVIDED)) { TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(port); @@ -326,6 +330,8 @@ public class MapUtil else { rule.run(); } + calcRunning = false; + return intf; } } @@ -333,6 +339,11 @@ public class MapUtil } private static Interface intf; + + /** + * avoid loops in calculation of derived interface + */ + private static boolean calcRunning = false; public static Interface getRequiredInterface(final Port port) { @@ -347,15 +358,18 @@ public class MapUtil } } else if(portKind.getBase_Class() != null) { - String ruleName = portKind.isExtendedPort() ? "ExtendedPort" : portKind.getBase_Class().getName(); + String ruleName = portKind.isExtendedPort() ? "ExtendedPort" : portKind.getBase_Class().getName(); //$NON-NLS-1$ final IMappingRule mappingRule = getMappingRule(ruleName); - if(mappingRule != null) { + if((mappingRule != null) && (!calcRunning)) { + Runnable rule = new Runnable() { public void run() { intf = mappingRule.getRequired(port, port.getConfiguration()); } }; + calcRunning = true; + if((mappingRule.needsTransaction() == IMappingRule.BOTH) || (mappingRule.needsTransaction() == IMappingRule.REQUIRED)) { TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(port); @@ -376,6 +390,7 @@ public class MapUtil else { rule.run(); } + calcRunning = false; return intf; } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo index aa3c4b90b68..873c9cbd4a9 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo @@ -18,7 +18,7 @@ <acceleoCompiler sourceFolder="${target.folder}" outputFolder="${target.folder}" - dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core;${target.folder}/../../org.eclipse.gef;${target.folder}/../../org.eclipse.ui.workbench;${target.folder}/../../org.eclipse.papyrus.uml.diagram.common;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.common;${target.folder}/../../org.eclipse.papyrus.uml.tools;${target.folder}/../../org.eclipse.emf.facet.infra.browser.uicore;${target.folder}/../../org.eclipse.papyrus.infra.services.validation;${target.folder}/../../org.eclipse.papyrus.infra.services.decoration;${target.folder}/../../org.eclipse.papyrus.infra.services.markerlistener;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.navigation;${target.folder}/../../org.eclipse.papyrus.infra.services.resourceloading;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.uml.properties;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;" + dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core;${target.folder}/../../org.eclipse.gef;${target.folder}/../../org.eclipse.papyrus.uml.diagram.common;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.common;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.commands;${target.folder}/../../org.eclipse.papyrus.uml.tools;${target.folder}/../../org.eclipse.emf.facet.infra.browser.uicore;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.navigation;${target.folder}/../../org.eclipse.papyrus.infra.services.resourceloading;${target.folder}/../../org.eclipse.papyrus.uml.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.uml.properties;${target.folder}/../../org.eclipse.papyrus.views.properties;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java index 5ec35925986..230d2485233 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java @@ -60,22 +60,6 @@ public class PortUtils { } /** - * true, if the port is conjugated - * -- with UML 2.3, UML itself will have an isConjugated attribute - * => remove FCM isConjugated attribute - * - * @param port - * @return - */ - public static boolean isConjugated(Port port) { - org.eclipse.papyrus.FCM.Port fcmPort = getFCMport(port); - if(fcmPort != null) { - return fcmPort.isConjugated(); - } - return false; - } - - /** * Returns all ports (including inherited ones) for an encapsulated classifier * * @param ec @@ -184,10 +168,10 @@ public class PortUtils { */ public static boolean matches(Port portA, Port portB, boolean isAssembly) { if(isAssembly) { - return (sameKinds(portA, portB) && (isConjugated(portA) != isConjugated(portB))); + return (sameKinds(portA, portB) && (portA.isConjugated() != portB.isConjugated())); } else { // delegation - return (sameKinds(portA, portB) && (isConjugated(portA) == isConjugated(portB))); + return (sameKinds(portA, portB) && (portA.isConjugated() == portB.isConjugated())); } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java index b9d498ae853..9aec990c390 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java @@ -4,6 +4,12 @@ import java.util.Iterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; +import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils; +import org.eclipse.papyrus.qompass.designer.core.CreationUtils; +import org.eclipse.papyrus.qompass.designer.core.Log; +import org.eclipse.papyrus.qompass.designer.core.PortUtils; +import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext; +import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.ConnectableElement; @@ -23,13 +29,6 @@ import org.eclipse.uml2.uml.TemplateParameterSubstitution; import org.eclipse.uml2.uml.TemplateSignature; import org.eclipse.uml2.uml.Type; -import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils; -import org.eclipse.papyrus.qompass.designer.core.CreationUtils; -import org.eclipse.papyrus.qompass.designer.core.Log; -import org.eclipse.papyrus.qompass.designer.core.PortUtils; -import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext; -import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; - public class ConnectorBinding { /** @@ -262,7 +261,7 @@ public class ConnectorBinding { // must be conjugated // TODO: isAssembly check will wrongly return false, if no port is connected [well, in this case, the role is not a port but a part] boolean isAssembly = (connEnd.getPartWithPort() != null); - boolean sameConjugation = (PortUtils.isConjugated(otherPort) == PortUtils.isConjugated(port)); + boolean sameConjugation = (otherPort.isConjugated() == port.isConjugated()); // if assembly connection, conjugations must be different. if(isAssembly == sameConjugation) { return actual; // was: continue |