Bug 2642 - [risk-analysis] Missing entry in build properties and constraining "Task" attribute
- Add missing entry to build.properties
- Change type of "Task" attribute to Namespace
- Regenerate profile
Change-Id: Ie31dd3fcc747cb8bbb1c67cf9bf981a0c0354bdc
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.notation b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.notation
index f774c04..6d69bd5 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.notation
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.notation
@@ -80,14 +80,14 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_MnCOVkAcEemSWsc0fABanw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_MnCOV0AcEemSWsc0fABanw"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_MnCOWEAcEemSWsc0fABanw" type="Stereotype_OperationCompartment">
+ <children xmi:type="notation:BasicCompartment" xmi:id="_MnCOWEAcEemSWsc0fABanw" visible="false" type="Stereotype_OperationCompartment">
<styles xmi:type="notation:TitleStyle" xmi:id="_MnCOWUAcEemSWsc0fABanw"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_MnCOWkAcEemSWsc0fABanw"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_MnCOW0AcEemSWsc0fABanw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_MnCOXEAcEemSWsc0fABanw"/>
</children>
<element xmi:type="uml:Stereotype" href="TaskBasedRiskAnalysis.profile.uml#_Mm4dUEAcEemSWsc0fABanw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MnCOUUAcEemSWsc0fABanw" x="160" y="320"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MnCOUUAcEemSWsc0fABanw" x="100" y="140" width="241" height="361"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_bPOikEUFEemrze-5W9aHHQ" type="Class_MetaclassShape">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bPOilEUFEemrze-5W9aHHQ" source="Stereotype_Annotation">
@@ -99,15 +99,15 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_bPOikkUFEemrze-5W9aHHQ" type="Class_MetaclassNameLabel"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bPOik0UFEemrze-5W9aHHQ" x="300" y="160"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bPOik0UFEemrze-5W9aHHQ" x="100" y="40" width="241"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_bPqnc0UFEemrze-5W9aHHQ" type="StereotypeComment">
- <styles xmi:type="notation:TitleStyle" xmi:id="_bPqndEUFEemrze-5W9aHHQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bPqndkUFEemrze-5W9aHHQ" name="BASE_ELEMENT">
+ <children xmi:type="notation:Shape" xmi:id="_ENAHoPTOEem9IPPy9muMOg" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ENAHofTOEem9IPPy9muMOg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ENAusPTOEem9IPPy9muMOg" name="BASE_ELEMENT">
<eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
</styles>
<element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bPqndUUFEemrze-5W9aHHQ" x="820" y="320"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ENAHovTOEem9IPPy9muMOg" x="500" y="160"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_Vp5uUT9eEemSWsc0fABanw" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_Vp5uUj9eEemSWsc0fABanw"/>
@@ -115,21 +115,21 @@
<owner xmi:type="uml:Profile" href="TaskBasedRiskAnalysis.profile.uml#_VoagkD9eEemSWsc0fABanw"/>
</styles>
<element xmi:type="uml:Profile" href="TaskBasedRiskAnalysis.profile.uml#_VoagkD9eEemSWsc0fABanw"/>
- <edges xmi:type="notation:Connector" xmi:id="_bPqnd0UFEemrze-5W9aHHQ" type="StereotypeCommentLink" source="_bPOikEUFEemrze-5W9aHHQ" target="_bPqnc0UFEemrze-5W9aHHQ">
- <styles xmi:type="notation:FontStyle" xmi:id="_bPqneEUFEemrze-5W9aHHQ"/>
- <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bPqnfEUFEemrze-5W9aHHQ" name="BASE_ELEMENT">
- <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </styles>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bPqneUUFEemrze-5W9aHHQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPqnekUFEemrze-5W9aHHQ"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPqne0UFEemrze-5W9aHHQ"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_cdVUcEUFEemrze-5W9aHHQ" type="Extension_Edge" source="_MnCOUEAcEemSWsc0fABanw" target="_bPOikEUFEemrze-5W9aHHQ">
<styles xmi:type="notation:FontStyle" xmi:id="_cdVUcUUFEemrze-5W9aHHQ"/>
<element xmi:type="uml:Extension" href="TaskBasedRiskAnalysis.profile.uml#_ccb8kEUFEemrze-5W9aHHQ"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cdVUckUFEemrze-5W9aHHQ" points="[400, 320, -643984, -643984]$[560, 270, -643984, -643984]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ceE7UEUFEemrze-5W9aHHQ" id="(0.7171314741035857,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ceE7UUUFEemrze-5W9aHHQ" id="(0.4,1.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ceE7UEUFEemrze-5W9aHHQ" id="(0.4979253112033195,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ceE7UUUFEemrze-5W9aHHQ" id="(0.4979253112033195,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_ENAusfTOEem9IPPy9muMOg" type="StereotypeCommentLink" source="_bPOikEUFEemrze-5W9aHHQ" target="_ENAHoPTOEem9IPPy9muMOg">
+ <styles xmi:type="notation:FontStyle" xmi:id="_ENAusvTOEem9IPPy9muMOg"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ENBVwvTOEem9IPPy9muMOg" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ENAus_TOEem9IPPy9muMOg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ENBVwPTOEem9IPPy9muMOg"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ENBVwfTOEem9IPPy9muMOg"/>
</edges>
</notation:Diagram>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.uml b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.uml
index 83e89c1..98a8c50 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.uml
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/TaskBasedRiskAnalysis.profile.uml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" 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/5.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="_VoagkD9eEemSWsc0fABanw" name="TaskBasedRiskAnalysis" metaclassReference="_hPKv8EAcEemSWsc0fABanw _hPT54EAcEemSWsc0fABanw _6XbR0ETSEemur4Ohd3RSdg _bOLZsEUFEemrze-5W9aHHQ">
+ <uml:Profile xmi:id="_VoagkD9eEemSWsc0fABanw" name="TaskBasedRiskAnalysis" metaclassReference="_hPKv8EAcEemSWsc0fABanw _hPT54EAcEemSWsc0fABanw _6XbR0ETSEemur4Ohd3RSdg _bOLZsEUFEemrze-5W9aHHQ _7O7j8PTOEem9IPPy9muMOg">
<elementImport xmi:type="uml:ElementImport" xmi:id="_hPKv8EAcEemSWsc0fABanw" alias="CallBehaviorAction">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#CallBehaviorAction"/>
</elementImport>
@@ -13,6 +13,9 @@
<elementImport xmi:type="uml:ElementImport" xmi:id="_bOLZsEUFEemrze-5W9aHHQ" alias="Property">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
</elementImport>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_7O7j8PTOEem9IPPy9muMOg" alias="Namespace">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
+ </elementImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_VughgD9eEemSWsc0fABanw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
@@ -21,7 +24,7 @@
</packageImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Mm4dUEAcEemSWsc0fABanw" name="HazardAnalysis">
<ownedAttribute xmi:type="uml:Property" xmi:id="_1B8SsEUFEemrze-5W9aHHQ" name="Task">
- <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Namespace"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_HSTXYETUEemur4Ohd3RSdg" name="Origin">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/riskanalysis.ecore b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/riskanalysis.ecore
index 4de91f2..9849a12 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/riskanalysis.ecore
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/model/riskanalysis.ecore
@@ -7,7 +7,7 @@
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="HazardAnalysis">
<eStructuralFeatures xsi:type="ecore:EReference" name="Task" ordered="false" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
+ eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Namespace"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="Origin" ordered="false"
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="HazardousSituation" ordered="false"
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/HazardAnalysis.java b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/HazardAnalysis.java
index ddf2da8..67e3c74 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/HazardAnalysis.java
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/HazardAnalysis.java
@@ -13,6 +13,7 @@
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
@@ -61,12 +62,12 @@
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Task</em>' reference.
- * @see #setTask(Operation)
+ * @see #setTask(Namespace)
* @see org.polarsys.esf.riskanalysis.RiskanalysisPackage#getHazardAnalysis_Task()
* @model required="true" ordered="false"
* @generated
*/
- Operation getTask();
+ Namespace getTask();
/**
* Sets the value of the '{@link org.polarsys.esf.riskanalysis.HazardAnalysis#getTask <em>Task</em>}' reference.
@@ -76,7 +77,7 @@
* @see #getTask()
* @generated
*/
- void setTask(Operation value);
+ void setTask(Namespace value);
/**
* Returns the value of the '<em><b>Origin</b></em>' attribute.
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/HazardAnalysisImpl.java b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/HazardAnalysisImpl.java
index 44601da..7f2e3cc 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/HazardAnalysisImpl.java
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/HazardAnalysisImpl.java
@@ -18,6 +18,7 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
import org.polarsys.esf.riskanalysis.HazardAnalysis;
@@ -67,7 +68,7 @@
* @generated
* @ordered
*/
- protected Operation task;
+ protected Namespace task;
/**
* The default value of the '{@link #getOrigin() <em>Origin</em>}' attribute.
@@ -434,10 +435,10 @@
* @generated
*/
@Override
- public Operation getTask() {
+ public Namespace getTask() {
if (task != null && task.eIsProxy()) {
InternalEObject oldTask = (InternalEObject)task;
- task = (Operation)eResolveProxy(oldTask);
+ task = (Namespace)eResolveProxy(oldTask);
if (task != oldTask) {
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.RESOLVE, RiskanalysisPackage.HAZARD_ANALYSIS__TASK, oldTask, task));
@@ -451,7 +452,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Operation basicGetTask() {
+ public Namespace basicGetTask() {
return task;
}
@@ -461,8 +462,8 @@
* @generated
*/
@Override
- public void setTask(Operation newTask) {
- Operation oldTask = task;
+ public void setTask(Namespace newTask) {
+ Namespace oldTask = task;
task = newTask;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, RiskanalysisPackage.HAZARD_ANALYSIS__TASK, oldTask, task));
@@ -981,7 +982,7 @@
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case RiskanalysisPackage.HAZARD_ANALYSIS__TASK:
- setTask((Operation)newValue);
+ setTask((Namespace)newValue);
return;
case RiskanalysisPackage.HAZARD_ANALYSIS__ORIGIN:
setOrigin((String)newValue);
@@ -1047,7 +1048,7 @@
public void eUnset(int featureID) {
switch (featureID) {
case RiskanalysisPackage.HAZARD_ANALYSIS__TASK:
- setTask((Operation)null);
+ setTask((Namespace)null);
return;
case RiskanalysisPackage.HAZARD_ANALYSIS__ORIGIN:
setOrigin(ORIGIN_EDEFAULT);
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/RiskanalysisPackageImpl.java b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/RiskanalysisPackageImpl.java
index 2147c2d..6978e69 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/RiskanalysisPackageImpl.java
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.profile/src-gen/org/polarsys/esf/riskanalysis/impl/RiskanalysisPackageImpl.java
@@ -460,7 +460,7 @@
// Initialize classes, features, and operations; add parameters
initEClass(hazardAnalysisEClass, HazardAnalysis.class, "HazardAnalysis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getHazardAnalysis_Task(), theUMLPackage.getOperation(), null, "Task", null, 1, 1, HazardAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getHazardAnalysis_Task(), theUMLPackage.getNamespace(), null, "Task", null, 1, 1, HazardAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getHazardAnalysis_Origin(), theTypesPackage.getString(), "Origin", null, 1, 1, HazardAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getHazardAnalysis_HazardousSituation(), theTypesPackage.getString(), "HazardousSituation", null, 1, 1, HazardAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(getHazardAnalysis_HazardousEvent(), theTypesPackage.getString(), "HazardousEvent", null, 1, 1, HazardAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
index 4eae765..b032dd4 100644
--- a/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
+++ b/analysis/riskanalysis/org.polarsys.esf.riskanalysis.table/build.properties
@@ -6,6 +6,7 @@
icons/,\
plugin.xml/,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ architecture/
output..=bin/
source..=src/
