1 files changed, 37 insertions, 24 deletions

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
index 8ba4cd160db..209840c214f 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl/src/org/eclipse/papyrus/eastadl/structure/featuremodeling/FeatureModel.java
@@ -22,13 +22,20 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Feature Model</b></em>'.

  * <!-- end-user-doc -->

- *

+ * 

  * <!-- begin-model-doc -->

- * FeatureModel denotes a model owning Features. The FeatureModel can be used to describe variability and commonality of a specified EE-System at any abstraction level in the SystemModel.

+ * FeatureModel denotes a model owning Features. The FeatureModel can be used to describe variability and commonality of a specified EE-System at any

+ * abstraction level in the SystemModel.

  * 

- * The FeatureModel can be used either to describe the variability within a particular Function or to describe the overall variability of a vehicle (cf. VehicleLevel). The FeatureModel describing internal variability of a FunctionType refers to the VehicleLevel by a «realizes» link (informative).

+ * The FeatureModel can be used either to describe the variability within a particular Function or to describe the overall variability of a vehicle

+ * (cf. VehicleLevel). The FeatureModel describing internal variability of a FunctionType refers to the VehicleLevel by a «realizes» link

+ * (informative).

  * 

- * Note, however, that a FeatureModel per definition does not always have to define variability. If a feature model contains only mandatory features, then its purpose is completely unrelated to variability. The features in such a FeatureModel could serve, for example, as invariant "coarse-grained requirements". The most important example is the core technical feature model on vehicle level which is also used for SystemModels that do not contain any variability at all. However, most uses of feature models in EAST-ADL2 are primarily motivated by variability definition and management.

+ * Note, however, that a FeatureModel per definition does not always have to define variability. If a feature model contains only mandatory features,

+ * then its purpose is completely unrelated to variability. The features in such a FeatureModel could serve, for example, as invariant

+ * "coarse-grained requirements". The most important example is the core technical feature model on vehicle level which is also used for SystemModels

+ * that do not contain any variability at all. However, most uses of feature models in EAST-ADL2 are primarily motivated by variability definition and

+ * management.

  * 

  * A public, local FeatureModel of an artifact element realizes a VehicleFeature of the VehicleLevel.

  * 

@@ -40,18 +47,18 @@ import org.eclipse.papyrus.eastadl.infrastructure.elements.Context;
  * Extension:

  * Package

  * <!-- end-model-doc -->

- *

+ * 

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature <em>Root Feature</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink <em>Feature Link</em>}</li>

- *   <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint <em>Feature Constraint</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getRootFeature <em>Root Feature</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureLink <em>Feature Link</em>}</li>

+ * <li>{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getFeatureConstraint <em>Feature Constraint</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel()

  * @model

  * @generated

@@ -62,10 +69,10 @@ public interface FeatureModel extends Context {
 	 * Returns the value of the '<em><b>Base Package</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Package</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Package</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Package</em>' reference.

 	 * @see #setBase_Package(org.eclipse.uml2.uml.Package)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_Base_Package()

@@ -75,10 +82,13 @@ public interface FeatureModel extends Context {
 	org.eclipse.uml2.uml.Package getBase_Package();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Package <em>Base Package</em>}'

+	 * reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Package</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Package</em>' reference.

 	 * @see #getBase_Package()

 	 * @generated

 	 */

@@ -88,10 +98,10 @@ public interface FeatureModel extends Context {
 	 * Returns the value of the '<em><b>Base Class</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Base Class</em>' reference.

 	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_Base_Class()

@@ -104,7 +114,9 @@ public interface FeatureModel extends Context {
 	 * Sets the value of the '{@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureModel#getBase_Class <em>Base Class</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Base Class</em>' reference.

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Base Class</em>' reference.

 	 * @see #getBase_Class()

 	 * @generated

 	 */

@@ -115,10 +127,11 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureConstraint}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature Constraint</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Feature Constraint</em>' containment reference list isn't clear, there really should be more of a description

+	 * here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Feature Constraint</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_FeatureConstraint()

 	 * @model ordered="false"

@@ -131,10 +144,10 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.FeatureLink}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Feature Link</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Feature Link</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Feature Link</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_FeatureLink()

 	 * @model ordered="false"

@@ -147,10 +160,10 @@ public interface FeatureModel extends Context {
 	 * The list contents are of type {@link org.eclipse.papyrus.eastadl.structure.featuremodeling.Feature}.

 	 * <!-- begin-user-doc -->

 	 * <p>

-	 * If the meaning of the '<em>Root Feature</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

+	 * If the meaning of the '<em>Root Feature</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the value of the '<em>Root Feature</em>' reference list.

 	 * @see org.eclipse.papyrus.eastadl.structure.featuremodeling.FeaturemodelingPackage#getFeatureModel_RootFeature()

 	 * @model ordered="false"