Set default value for manual direction to undefined (assure that calculation is done)
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
index 6741862..4d9c3a7 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/ISPortLAnalysis.java
@@ -131,6 +131,7 @@
/**
* Returns the value of the '<em><b>SDirection Manual</b></em>' attribute.
+ * The default value is <code>"UNDEFINED"</code>.
* The literals are from the enumeration {@link org.polarsys.esf.esfarchitectureconcepts.SDirection}.
* <!-- begin-user-doc -->
* <p>
@@ -143,7 +144,7 @@
* @see org.polarsys.esf.esfarchitectureconcepts.SDirection
* @see #setSDirectionManual(SDirection)
* @see org.polarsys.esf.esflocalanalysis.IESFLocalAnalysisPackage#getSPortLAnalysis_SDirectionManual()
- * @model ordered="false"
+ * @model default="UNDEFINED" ordered="false"
* @generated
*/
SDirection getSDirectionManual();
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
index c194174..19ed36e 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/ESFLocalAnalysisPackage.java
@@ -1588,8 +1588,8 @@
!IS_DERIVED, !IS_ORDERED);
initEReference(getSPortLAnalysis_Base_Port(), theUMLPackage.getPort(), null, "base_Port", null, 1, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
!IS_ORDERED);
- initEAttribute(getSPortLAnalysis_SDirectionManual(), theESFArchitectureConceptsPackage.getSDirection(), "sDirectionManual", null, 0, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$
- !IS_ORDERED);
+ initEAttribute(getSPortLAnalysis_SDirectionManual(), theESFArchitectureConceptsPackage.getSDirection(), "sDirectionManual", "UNDEFINED", 0, 1, ISPortLAnalysis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$ //$NON-NLS-2$
+ !IS_DERIVED, !IS_ORDERED);
initEAttribute(getSPortLAnalysis_SDirectionLAnalysis(), theESFArchitectureConceptsPackage.getSDirection(), "sDirectionLAnalysis", null, 1, 1, ISPortLAnalysis.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$
IS_DERIVED, !IS_ORDERED);
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
index 50904a6..fae1724 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src-gen/main/java/org/polarsys/esf/esflocalanalysis/impl/SPortLAnalysis.java
@@ -75,7 +75,7 @@
* @generated
* @ordered
*/
- protected static final SDirection SDIRECTION_MANUAL_EDEFAULT = SDirection.IN;
+ protected static final SDirection SDIRECTION_MANUAL_EDEFAULT = SDirection.UNDEFINED;
/**
* The cached value of the '{@link #getSDirectionManual() <em>SDirection Manual</em>}' attribute.
@@ -277,7 +277,7 @@
*/
@Override
public SDirection getSDirectionLAnalysis() {
- // TODO: implement this method to return the 'SDirection' attribute
+ // TODO: implement this method to return the 'SDirection LAnalysis' attribute
// Ensure that you remove @generated or mark it @generated NOT
throw new UnsupportedOperationException();
}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
index 781fc04..10e1141 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/genmodel/esflocalanalysis.ecore
@@ -16,7 +16,8 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Port" ordered="false"
lowerBound="1" eType="ecore:EClass ../../../../../../org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sDirectionManual" ordered="false"
- eType="ecore:EEnum ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SDirection"/>
+ eType="ecore:EEnum ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SDirection"
+ defaultValueLiteral="UNDEFINED"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sDirectionLAnalysis" ordered="false"
lowerBound="1" eType="ecore:EEnum ../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/genmodel/esfarchitectureconcepts.ecore#//SDirection"
changeable="false" volatile="true" transient="true" derived="true"/>
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
index 7e81249..f9d25cf 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.notation
@@ -1738,6 +1738,14 @@
<element xsi:nil="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z-hfwiU0Eem0xphtddBpYA" x="281" y="67"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_jp29kC-xEemZ9sGTYoxswQ" type="StereotypeComment">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_jp29kS-xEemZ9sGTYoxswQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jp29ky-xEemZ9sGTYoxswQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jp29ki-xEemZ9sGTYoxswQ" x="260" y="40"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_DqgYsRjbEeWhPZtBPxjsVg" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_DqgYshjbEeWhPZtBPxjsVg"/>
<styles xmi:type="style_1:PapyrusDiagramStyle" xmi:id="_5Be-UCUwEem0xphtddBpYA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
@@ -2602,6 +2610,16 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-iG0CU0Eem0xphtddBpYA"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z-iG0SU0Eem0xphtddBpYA"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_jp29lC-xEemZ9sGTYoxswQ" type="StereotypeCommentLink" source="_E4vGYBjbEeWhPZtBPxjsVg" target="_jp29kC-xEemZ9sGTYoxswQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_jp29lS-xEemZ9sGTYoxswQ"/>
+ <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jp29mS-xEemZ9sGTYoxswQ" name="BASE_ELEMENT">
+ <eObjectValue xmi:type="uml:Profile" href="esflocalanalysis.profile.uml#_iswZgBi_EeWhPZtBPxjsVg"/>
+ </styles>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jp29li-xEemZ9sGTYoxswQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jp29ly-xEemZ9sGTYoxswQ"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jp29mC-xEemZ9sGTYoxswQ"/>
+ </edges>
</notation:Diagram>
<notation:Diagram xmi:id="_PmZ5oCCUEeWTgM-gIHMuxg" type="PapyrusUMLClassDiagram" name="Overview PackageDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_RH_BICCUEeWTgM-gIHMuxg" type="Package_Shape">
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
index 4a7090c..a8bb8d8 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/resources/models/profile/esflocalanalysis.profile.uml
@@ -37,6 +37,9 @@
<ownedAttribute xmi:type="uml:Property" xmi:id="_RiO60CUyEem0xphtddBpYA" name="sDirectionManual" visibility="public">
<type xmi:type="uml:Enumeration" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_poRGsCUyEem0xphtddBpYA"/>
+ <defaultValue xmi:type="uml:InstanceValue" xmi:id="_uHc90C-xEemZ9sGTYoxswQ">
+ <instance xmi:type="uml:EnumerationLiteral" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_oHVA8CVJEem-GJMZWmWtMw"/>
+ </defaultValue>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_91-9gEdjEeaeKb9H0TbPpw" name="sDirectionLAnalysis" isReadOnly="true" isDerived="true">
<type xmi:type="uml:Enumeration" href="../../../../../../org.polarsys.esf.core.profile.esfarchitectureconcepts/src/main/resources/models/profile/esfarchitectureconcepts.profile.uml#_sfK48MXNEeWgbp76yZjh7g"/>