diff options
author | Ansgar Radermacher | 2013-09-16 09:05:08 +0000 |
---|---|---|
committer | Ansgar Radermacher | 2013-10-08 12:37:28 +0000 |
commit | 77af26e5a90a8c2e76b79dbe79b224a5d96fe7c8 (patch) | |
tree | 3d196443cd42453b878a94ea297e104eddcd09f1 /extraplugins | |
parent | 69ce7b2b05d99268caa04b7ea470a34c18af3b5b (diff) | |
download | org.eclipse.papyrus-77af26e5a90a8c2e76b79dbe79b224a5d96fe7c8.tar.gz org.eclipse.papyrus-77af26e5a90a8c2e76b79dbe79b224a5d96fe7c8.tar.xz org.eclipse.papyrus-77af26e5a90a8c2e76b79dbe79b224a5d96fe7c8.zip |
Change cardinality of tool-chain reference in Target stereotype. Qompass chooses a platform default, if the tool-chain is
not set, so this should not provoke an error
Diffstat (limited to 'extraplugins')
5 files changed, 6 insertions, 6 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 8d48682624a..3c0879c3851 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 @@ -271,7 +271,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="availROM" ordered="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Integer"/> <eStructuralFeatures xsi:type="ecore:EReference" name="compiler" ordered="false" - lowerBound="1" eType="#//CompilerChain"/> + eType="#//CompilerChain"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CompilerChain"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false" 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 e9b09dfbb2d..2b6b95700a7 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 @@ -1936,7 +1936,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="214" height="135"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x935QcniEeCWXsgs0yuyKQ" x="111" y="253" width="223" 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"> @@ -1950,7 +1950,7 @@ </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="217"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0A7WIcniEeCWXsgs0yuyKQ" x="108" y="126" width="226"/> </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"> 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 f6796112898..b1d1bfc96df 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 @@ -526,7 +526,7 @@ For instance, we cound type a port with "MyType" and use an extended p </defaultValue> </ownedAttribute> <ownedAttribute xmi:type="uml:Property" xmi:id="_8g_IsNTGEeKiLbHSN_MIRQ" name="compiler" visibility="public" type="_iDiaINRxEeKiLbHSN_MIRQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AIgB8NTHEeKiLbHSN_MIRQ" value="1"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AIgB8NTHEeKiLbHSN_MIRQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AJC0gNTHEeKiLbHSN_MIRQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_AKHykNTHEeKiLbHSN_MIRQ"> <value xsi:nil="true"/> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java index f40df194b12..7978b1bdec8 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Target.java @@ -191,7 +191,7 @@ public interface Target extends EObject { * @return the value of the '<em>Compiler</em>' reference. * @see #setCompiler(CompilerChain) * @see org.eclipse.papyrus.FCM.FCMPackage#getTarget_Compiler() - * @model required="true" ordered="false" + * @model ordered="false" * @generated */ CompilerChain getCompiler(); 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 a8d1b1f1798..b957363d06f 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 @@ -1855,7 +1855,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage { initEReference(getTarget_UsedOS(), this.getOperatingSystem(), null, "usedOS", null, 1, 1, Target.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getTarget_AvailRAM(), theTypesPackage.getInteger(), "availRAM", null, 1, 1, Target.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getTarget_AvailROM(), theTypesPackage.getInteger(), "availROM", null, 1, 1, Target.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getTarget_Compiler(), this.getCompilerChain(), null, "compiler", null, 1, 1, Target.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); + initEReference(getTarget_Compiler(), this.getCompilerChain(), null, "compiler", null, 0, 1, Target.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(compilerChainEClass, CompilerChain.class, "CompilerChain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getCompilerChain_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, CompilerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); |