ASSIGNED - bug 297746: Typo in SysML profile: extension ParameterOptionnal should be ParameterOptional

https://bugs.eclipse.org/bugs/show_bug.cgi?id=297746

15 files changed, 264 insertions, 229 deletions

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
index 7b7c428c715..7b7c428c715 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
index 38f0f14418b..a75d3437257 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
@@ -136,3 +136,5 @@ _UI_Unknown_feature = Unspecified
 _UI_FlowDirection_in_literal = in

 _UI_FlowDirection_out_literal = out

 _UI_FlowDirection_inout_literal = inout

+_UI_Optional_type = Optional

+_UI_Optional_base_Parameter_feature = Base Parameter

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
index 14a9d6df046..d14d9b21a4f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
@@ -83,27 +83,28 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optionnal} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optional} instances.

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

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

 	 * 

 	 * @generated

 	 */

-	protected OptionnalItemProvider optionnalItemProvider;

+	protected OptionalItemProvider optionalItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optionnal}. <!--

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

+	 * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional}.

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createOptionnalAdapter() {

-		if(optionnalItemProvider == null) {

-			optionnalItemProvider = new OptionnalItemProvider(this);

+	public Adapter createOptionalAdapter() {

+		if(optionalItemProvider == null) {

+			optionalItemProvider = new OptionalItemProvider(this);

 		}

 

-		return optionnalItemProvider;

+		return optionalItemProvider;

 	}

 

 	/**

@@ -376,8 +377,8 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
 	 * @generated

 	 */

 	public void dispose() {

-		if(optionnalItemProvider != null)

-			optionnalItemProvider.dispose();

+		if(optionalItemProvider != null)

+			optionalItemProvider.dispose();

 		if(rateItemProvider != null)

 			rateItemProvider.dispose();

 		if(probabilityItemProvider != null)

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionnalItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
index 5c69870ed65..402d795c15a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionnalItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
@@ -13,6 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.sysml.activities.provider;

 

+

 import java.util.Collection;

 import java.util.List;

 

@@ -31,28 +32,29 @@ import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
 import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;

 

 /**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optionnal} object. <!-- begin-user-doc --> <!-- end-user-doc

- * -->

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional} object.

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

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

  * 

  * @generated

  */

-public class OptionnalItemProvider extends ResourceEObjectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+public class OptionalItemProvider extends ResourceEObjectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

 

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

-	 * end-user-doc -->

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

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

 	 * 

 	 * @generated

 	 */

-	public OptionnalItemProvider(AdapterFactory adapterFactory) {

+	public OptionalItemProvider(AdapterFactory adapterFactory) {

 		super(adapterFactory);

 	}

 

 	/**

 	 * This returns the property descriptors for the adapted class.

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

-	 * end-user-doc -->

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

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

 	 * 

 	 * @generated

 	 */

@@ -68,41 +70,44 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
 

 	/**

 	 * This adds a property descriptor for the Base Parameter feature.

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

-	 * end-user-doc -->

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

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

 	 * 

 	 * @generated

 	 */

 	protected void addBase_ParameterPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optionnal_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Optionnal_base_Parameter_feature", "_UI_Optionnal_type"), ActivitiesPackage.Literals.OPTIONNAL__BASE_PARAMETER, true, false, true, null, null, null));

+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"), ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true, null, null, null));

 	}

 

 	/**

-	 * This returns Optionnal.gif.

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

+	 * This returns Optional.gif.

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Optionnal"));

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Optional"));

 	}

 

 	/**

-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

+	 * This returns the label text for the adapted class.

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		return getString("_UI_Optionnal_type");

+		return getString("_UI_Optional_type");

 	}

 

 	/**

 	 * This handles model notifications by calling {@link #updateChildren} to update any cached

 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

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

 	 * 

 	 * @generated

 	 */

@@ -115,7 +120,8 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
 	/**

 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

 	 * that can be created under this object.

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

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

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

 	 * 

 	 * @generated

 	 */

@@ -126,8 +132,8 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
 

 	/**

 	 * Return the resource locator for this item provider's resources.

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

-	 * end-user-doc -->

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

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

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
index 981297f4d06..08278be5e6a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/SysML.profile.uml
@@ -500,7 +500,7 @@
       </packagedElement>

     </packagedElement>

     <packagedElement xmi:type="uml:Profile" xmi:id="_C2zXMLX8EduFmqQsrNB9lw" name="Activities">

-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_1uhmQLXjEduHWpAaWjM62w" name="Optionnal">

+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_1uhmQLXjEduHWpAaWjM62w" name="Optional">

         <ownedAttribute xmi:id="_Cs5hMLXkEduHWpAaWjM62w" name="base_Parameter" isUnique="false" association="_CslYILXkEduHWpAaWjM62w">

           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>

         </ownedAttribute>

@@ -543,8 +543,8 @@
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_-N-e0LXjEduHWpAaWjM62w" name="Discrete">

         <generalization xmi:id="_BcS08LXkEduHWpAaWjM62w" general="_2a7ZQLXjEduHWpAaWjM62w"/>

       </packagedElement>

-      <packagedElement xmi:type="uml:Extension" xmi:id="_CslYILXkEduHWpAaWjM62w" name="ParameterOptionnal" memberEnd="_CsppkLXkEduHWpAaWjM62w _Cs5hMLXkEduHWpAaWjM62w">

-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CsppkLXkEduHWpAaWjM62w" name="extension_Optionnal" type="_1uhmQLXjEduHWpAaWjM62w" aggregation="composite" association="_CslYILXkEduHWpAaWjM62w"/>

+      <packagedElement xmi:type="uml:Extension" xmi:id="_CslYILXkEduHWpAaWjM62w" name="ParameterOptional" memberEnd="_CsppkLXkEduHWpAaWjM62w _Cs5hMLXkEduHWpAaWjM62w">

+        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_CsppkLXkEduHWpAaWjM62w" name="extension_Optional" type="_1uhmQLXjEduHWpAaWjM62w" aggregation="composite" association="_CslYILXkEduHWpAaWjM62w"/>

       </packagedElement>

       <packagedElement xmi:type="uml:Extension" xmi:id="_C-XrsLXkEduHWpAaWjM62w" name="ParameterRate" memberEnd="_C-b9ILXkEduHWpAaWjM62w _C-oKYLXkEduHWpAaWjM62w">

         <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_C-b9ILXkEduHWpAaWjM62w" name="extension_Rate" type="_2a7ZQLXjEduHWpAaWjM62w" aggregation="composite" association="_C-XrsLXkEduHWpAaWjM62w"/>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
index 3391aaa65e3..f0c21100877 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.ecore
@@ -151,7 +151,7 @@
   </eSubpackages>

   <eSubpackages name="activities" nsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities"

       nsPrefix="Activities">

-    <eClassifiers xsi:type="ecore:EClass" name="Optionnal" eSuperTypes="platform:/plugin/org.eclipse.papyrus.resource/model/resource.ecore#//ResourceEObject">

+    <eClassifiers xsi:type="ecore:EClass" name="Optional" eSuperTypes="platform:/plugin/org.eclipse.papyrus.resource/model/resource.ecore#//ResourceEObject">

       <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"

           unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>

     </eClassifiers>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
index ad84f920a50..aa942e8fc0c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/model/sysml.genmodel
@@ -143,9 +143,9 @@
     <nestedGenPackages prefix="Activities" basePackage="org.eclipse.papyrus.sysml"

         resource="XML" disposableProviderFactory="true" generateExampleClass="false"

         ecorePackage="sysml.ecore#//activities">

-      <genClasses ecoreClass="sysml.ecore#//activities/Optionnal">

+      <genClasses ecoreClass="sysml.ecore#//activities/Optional">

         <genFeatures notify="false" createChild="false" propertySortChoices="true"

-            ecoreFeature="ecore:EReference sysml.ecore#//activities/Optionnal/base_Parameter"/>

+            ecoreFeature="ecore:EReference sysml.ecore#//activities/Optional/base_Parameter"/>

       </genClasses>

       <genClasses ecoreClass="sysml.ecore#//activities/Rate">

         <genFeatures notify="false" createChild="false" propertySortChoices="true"

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
index 6b2de56e99b..bebf36a3034 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesFactory.java
@@ -33,6 +33,16 @@ public interface ActivitiesFactory extends EFactory {
 	ActivitiesFactory eINSTANCE = org.eclipse.papyrus.sysml.activities.impl.ActivitiesFactoryImpl.init();

 

 	/**

+	 * Returns a new object of class '<em>Optional</em>'.

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

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

+	 * 

+	 * @return a new object of class '<em>Optional</em>'.

+	 * @generated

+	 */

+	Optional createOptional();

+

+	/**

 	 * Returns a new object of class '<em>Continuous</em>'.

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

 	 * end-user-doc -->

@@ -71,15 +81,6 @@ public interface ActivitiesFactory extends EFactory {
 	NoBuffer createNoBuffer();

 

 	/**

-	 * Returns a new object of class '<em>Optionnal</em>'. <!-- begin-user-doc --> <!-- end-user-doc

-	 * -->

-	 * 

-	 * @return a new object of class '<em>Optionnal</em>'.

-	 * @generated

-	 */

-	Optionnal createOptionnal();

-

-	/**

 	 * Returns a new object of class '<em>Overwrite</em>'. <!-- begin-user-doc --> <!-- end-user-doc

 	 * -->

 	 * 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
index ec29825d61a..1c048c4614c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/ActivitiesPackage.java
@@ -50,22 +50,24 @@ public interface ActivitiesPackage extends EPackage {
 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.impl.OptionnalImpl <em>Optionnal</em>}' class.

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

+		 * The meta object literal for the '{@link org.eclipse.papyrus.sysml.activities.impl.OptionalImpl <em>Optional</em>}' class.

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

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

 		 * 

-		 * @see org.eclipse.papyrus.sysml.activities.impl.OptionnalImpl

-		 * @see org.eclipse.papyrus.sysml.activities.impl.ActivitiesPackageImpl#getOptionnal()

+		 * @see org.eclipse.papyrus.sysml.activities.impl.OptionalImpl

+		 * @see org.eclipse.papyrus.sysml.activities.impl.ActivitiesPackageImpl#getOptional()

 		 * @generated

 		 */

-		EClass OPTIONNAL = eINSTANCE.getOptionnal();

+		EClass OPTIONAL = eINSTANCE.getOptional();

 

 		/**

-		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature. <!--

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

+		 * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.

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

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

 		 * 

 		 * @generated

 		 */

-		EReference OPTIONNAL__BASE_PARAMETER = eINSTANCE.getOptionnal_Base_Parameter();

+		EReference OPTIONAL__BASE_PARAMETER = eINSTANCE.getOptional_Base_Parameter();

 

 		/**

 		 * The meta object literal for the ' {@link org.eclipse.papyrus.sysml.activities.impl.RateImpl <em>Rate</em>}' class. <!--

@@ -252,14 +254,15 @@ public interface ActivitiesPackage extends EPackage {
 	ActivitiesPackage eINSTANCE = org.eclipse.papyrus.sysml.activities.impl.ActivitiesPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.impl.OptionnalImpl <em>Optionnal</em>}' class.

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

+	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.impl.OptionalImpl <em>Optional</em>}' class.

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

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

 	 * 

-	 * @see org.eclipse.papyrus.sysml.activities.impl.OptionnalImpl

-	 * @see org.eclipse.papyrus.sysml.activities.impl.ActivitiesPackageImpl#getOptionnal()

+	 * @see org.eclipse.papyrus.sysml.activities.impl.OptionalImpl

+	 * @see org.eclipse.papyrus.sysml.activities.impl.ActivitiesPackageImpl#getOptional()

 	 * @generated

 	 */

-	int OPTIONNAL = 0;

+	int OPTIONAL = 0;

 

 	/**

 	 * The feature id for the '<em><b>Base Parameter</b></em>' reference.

@@ -269,17 +272,17 @@ public interface ActivitiesPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int OPTIONNAL__BASE_PARAMETER = ResourcePackage.RESOURCE_EOBJECT_FEATURE_COUNT + 0;

+	int OPTIONAL__BASE_PARAMETER = ResourcePackage.RESOURCE_EOBJECT_FEATURE_COUNT + 0;

 

 	/**

-	 * The number of structural features of the '<em>Optionnal</em>' class.

+	 * The number of structural features of the '<em>Optional</em>' class.

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

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

 	 * 

 	 * @generated

 	 * @ordered

 	 */

-	int OPTIONNAL_FEATURE_COUNT = ResourcePackage.RESOURCE_EOBJECT_FEATURE_COUNT + 1;

+	int OPTIONAL_FEATURE_COUNT = ResourcePackage.RESOURCE_EOBJECT_FEATURE_COUNT + 1;

 

 	/**

 	 * The meta object id for the '{@link org.eclipse.papyrus.sysml.activities.impl.RateImpl <em>Rate</em>}' class.

@@ -581,6 +584,29 @@ public interface ActivitiesPackage extends EPackage {
 	int OVERWRITE_FEATURE_COUNT = ResourcePackage.RESOURCE_EOBJECT_FEATURE_COUNT + 1;

 

 	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Optional <em>Optional</em>}'.

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

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

+	 * 

+	 * @return the meta object for class '<em>Optional</em>'.

+	 * @see org.eclipse.papyrus.sysml.activities.Optional

+	 * @generated

+	 */

+	EClass getOptional();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}'.

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

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

+	 * 

+	 * @return the meta object for the reference '<em>Base Parameter</em>'.

+	 * @see org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter()

+	 * @see #getOptional()

+	 * @generated

+	 */

+	EReference getOptional_Base_Parameter();

+

+	/**

 	 * Returns the factory that creates the instances of the model.

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

 	 * end-user-doc -->

@@ -666,27 +692,6 @@ public interface ActivitiesPackage extends EPackage {
 	EReference getNoBuffer_Base_ObjectNode();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Optionnal <em>Optionnal</em>}'.

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

-	 * 

-	 * @return the meta object for class '<em>Optionnal</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Optionnal

-	 * @generated

-	 */

-	EClass getOptionnal();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.sysml.activities.Optionnal#getBase_Parameter <em>Base Parameter</em>}'.

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

-	 * 

-	 * @return the meta object for the reference '<em>Base Parameter</em>'.

-	 * @see org.eclipse.papyrus.sysml.activities.Optionnal#getBase_Parameter()

-	 * @see #getOptionnal()

-	 * @generated

-	 */

-	EReference getOptionnal_Base_Parameter();

-

-	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.sysml.activities.Overwrite <em>Overwrite</em>}'.

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

 	 * 

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optionnal.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
index ba0ec7db7ec..7bc14523e1a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optionnal.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/Optional.java
@@ -17,21 +17,22 @@ import org.eclipse.papyrus.resource.ResourceEObject;
 import org.eclipse.uml2.uml.Parameter;

 

 /**

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

- * end-user-doc -->

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

+ * A representation of the model object '<em><b>Optional</b></em>'.

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

  * 

  * <p>

  * The following features are supported:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.Optionnal#getBase_Parameter <em>Base Parameter</em>}</li>

+ * <li>{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptionnal()

+ * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional()

  * @model

  * @generated

  */

-public interface Optionnal extends ResourceEObject {

+public interface Optional extends ResourceEObject {

 

 	/**

 	 * Returns the value of the '<em><b>Base Parameter</b></em>' reference.

@@ -43,15 +44,16 @@ public interface Optionnal extends ResourceEObject {
 	 * 

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

 	 * @see #setBase_Parameter(Parameter)

-	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptionnal_Base_Parameter()

+	 * @see org.eclipse.papyrus.sysml.activities.ActivitiesPackage#getOptional_Base_Parameter()

 	 * @model required="true" ordered="false"

 	 * @generated

 	 */

 	Parameter getBase_Parameter();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Optionnal#getBase_Parameter <em>Base Parameter</em>}' reference.

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

+	 * Sets the value of the '{@link org.eclipse.papyrus.sysml.activities.Optional#getBase_Parameter <em>Base Parameter</em>}' reference.

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

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

 	 * 

 	 * @param value

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

@@ -60,4 +62,4 @@ public interface Optionnal extends ResourceEObject {
 	 */

 	void setBase_Parameter(Parameter value);

 

-} // Optionnal

+} // Optional

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesFactoryImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesFactoryImpl.java
index 589a62712a3..3ca9b104cfc 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesFactoryImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesFactoryImpl.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.sysml.activities.Continuous;
 import org.eclipse.papyrus.sysml.activities.ControlOperator;

 import org.eclipse.papyrus.sysml.activities.Discrete;

 import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optionnal;

+import org.eclipse.papyrus.sysml.activities.Optional;

 import org.eclipse.papyrus.sysml.activities.Overwrite;

 import org.eclipse.papyrus.sysml.activities.Probability;

 import org.eclipse.papyrus.sysml.activities.Rate;

@@ -83,8 +83,8 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 	@Override

 	public EObject create(EClass eClass) {

 		switch(eClass.getClassifierID()) {

-		case ActivitiesPackage.OPTIONNAL:

-			return createOptionnal();

+		case ActivitiesPackage.OPTIONAL:

+			return createOptional();

 		case ActivitiesPackage.RATE:

 			return createRate();

 		case ActivitiesPackage.PROBABILITY:

@@ -105,6 +105,17 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 	}

 

 	/**

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

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

+	 * 

+	 * @generated

+	 */

+	public Optional createOptional() {

+		OptionalImpl optional = new OptionalImpl();

+		return optional;

+	}

+

+	/**

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

 	 * 

 	 * @generated

@@ -149,16 +160,6 @@ public class ActivitiesFactoryImpl extends EFactoryImpl implements ActivitiesFac
 	 * 

 	 * @generated

 	 */

-	public Optionnal createOptionnal() {

-		OptionnalImpl optionnal = new OptionnalImpl();

-		return optionnal;

-	}

-

-	/**

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

-	 * 

-	 * @generated

-	 */

 	public Overwrite createOverwrite() {

 		OverwriteImpl overwrite = new OverwriteImpl();

 		return overwrite;

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesPackageImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesPackageImpl.java
index 7fe97f5f925..dba9f998c4c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesPackageImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/ActivitiesPackageImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.sysml.activities.Continuous;
 import org.eclipse.papyrus.sysml.activities.ControlOperator;

 import org.eclipse.papyrus.sysml.activities.Discrete;

 import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optionnal;

+import org.eclipse.papyrus.sysml.activities.Optional;

 import org.eclipse.papyrus.sysml.activities.Overwrite;

 import org.eclipse.papyrus.sysml.activities.Probability;

 import org.eclipse.papyrus.sysml.activities.Rate;

@@ -59,6 +59,14 @@ import org.eclipse.uml2.uml.UMLPackage;
 public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPackage {

 

 	/**

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

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

+	 * 

+	 * @generated

+	 */

+	private EClass optionalEClass = null;

+

+	/**

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

 	 * 

 	 * @generated

@@ -137,11 +145,24 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 	}

 

 	/**

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

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

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

+	 * 

+	 * @generated

+	 */

+	public EClass getOptional() {

+		return optionalEClass;

+	}

+

+	/**

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

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

 	 * 

 	 * @generated

 	 */

-	private EClass optionnalEClass = null;

+	public EReference getOptional_Base_Parameter() {

+		return (EReference)optionalEClass.getEStructuralFeatures().get(0);

+	}

 

 	/**

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

@@ -236,8 +257,8 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 		isCreated = true;

 

 		// Create classes and their features

-		optionnalEClass = createEClass(OPTIONNAL);

-		createEReference(optionnalEClass, OPTIONNAL__BASE_PARAMETER);

+		optionalEClass = createEClass(OPTIONAL);

+		createEReference(optionalEClass, OPTIONAL__BASE_PARAMETER);

 

 		rateEClass = createEClass(RATE);

 		createEReference(rateEClass, RATE__BASE_PARAMETER);

@@ -341,24 +362,6 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 	 * 

 	 * @generated

 	 */

-	public EClass getOptionnal() {

-		return optionnalEClass;

-	}

-

-	/**

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

-	 * 

-	 * @generated

-	 */

-	public EReference getOptionnal_Base_Parameter() {

-		return (EReference)optionnalEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

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

-	 * 

-	 * @generated

-	 */

 	public EClass getOverwrite() {

 		return overwriteEClass;

 	}

@@ -470,7 +473,7 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 		// Set bounds for type parameters

 

 		// Add supertypes to classes

-		optionnalEClass.getESuperTypes().add(theResourcePackage.getResourceEObject());

+		optionalEClass.getESuperTypes().add(theResourcePackage.getResourceEObject());

 		rateEClass.getESuperTypes().add(theResourcePackage.getResourceEObject());

 		probabilityEClass.getESuperTypes().add(theResourcePackage.getResourceEObject());

 		continuousEClass.getESuperTypes().add(this.getRate());

@@ -480,8 +483,8 @@ public class ActivitiesPackageImpl extends EPackageImpl implements ActivitiesPac
 		overwriteEClass.getESuperTypes().add(theResourcePackage.getResourceEObject());

 

 		// Initialize classes and features; add operations and parameters

-		initEClass(optionnalEClass, Optionnal.class, "Optionnal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getOptionnal_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Optionnal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEClass(optionalEClass, Optional.class, "Optional", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getOptional_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Optional.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

 

 		initEClass(rateEClass, Rate.class, "Rate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 		initEReference(getRate_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 1, 1, Rate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/OptionnalImpl.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/OptionalImpl.java
index a8b340fc4ba..043b1805c73 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/OptionnalImpl.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/impl/OptionalImpl.java
@@ -19,26 +19,28 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.papyrus.resource.impl.ResourceEObjectImpl;

 import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;

-import org.eclipse.papyrus.sysml.activities.Optionnal;

+import org.eclipse.papyrus.sysml.activities.Optional;

 import org.eclipse.uml2.uml.Parameter;

 

 /**

- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Optionnal</b></em>'. <!--

- * end-user-doc -->

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

+ * An implementation of the model object '<em><b>Optional</b></em>'.

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

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.papyrus.sysml.activities.impl.OptionnalImpl#getBase_Parameter <em>Base Parameter</em>}</li>

+ * <li>{@link org.eclipse.papyrus.sysml.activities.impl.OptionalImpl#getBase_Parameter <em>Base Parameter</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class OptionnalImpl extends ResourceEObjectImpl implements Optionnal {

+public class OptionalImpl extends ResourceEObjectImpl implements Optional {

 

 	/**

 	 * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.

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

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

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

 	 * 

 	 * @see #getBase_Parameter()

 	 * @generated

@@ -47,16 +49,47 @@ public class OptionnalImpl extends ResourceEObjectImpl implements Optionnal {
 	protected Parameter base_Parameter;

 

 	/**

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

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

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

 	 * 

 	 * @generated

 	 */

-	protected OptionnalImpl() {

+	protected OptionalImpl() {

 		super();

 	}

 

 	/**

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

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

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

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ActivitiesPackage.Literals.OPTIONAL;

+	}

+

+	/**

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

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

+	 * 

+	 * @generated

+	 */

+	public Parameter getBase_Parameter() {

+		if(base_Parameter != null && base_Parameter.eIsProxy()) {

+			InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;

+			base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);

+			if(base_Parameter != oldBase_Parameter) {

+				if(eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+			}

+		}

+		return base_Parameter;

+	}

+

+	/**

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

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

 	 * 

 	 * @generated

 	 */

@@ -65,44 +98,45 @@ public class OptionnalImpl extends ResourceEObjectImpl implements Optionnal {
 	}

 

 	/**

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

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

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

 	 * 

 	 * @generated

 	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case ActivitiesPackage.OPTIONNAL__BASE_PARAMETER:

-			if(resolve)

-				return getBase_Parameter();

-			return basicGetBase_Parameter();

-		}

-		return super.eGet(featureID, resolve, coreType);

+	public void setBase_Parameter(Parameter newBase_Parameter) {

+		Parameter oldBase_Parameter = base_Parameter;

+		base_Parameter = newBase_Parameter;

+		if(eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OPTIONAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

 	}

 

 	/**

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

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

-	public boolean eIsSet(int featureID) {

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch(featureID) {

-		case ActivitiesPackage.OPTIONNAL__BASE_PARAMETER:

-			return base_Parameter != null;

+		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

+			if(resolve)

+				return getBase_Parameter();

+			return basicGetBase_Parameter();

 		}

-		return super.eIsSet(featureID);

+		return super.eGet(featureID, resolve, coreType);

 	}

 

 	/**

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

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch(featureID) {

-		case ActivitiesPackage.OPTIONNAL__BASE_PARAMETER:

+		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

 			setBase_Parameter((Parameter)newValue);

 			return;

 		}

@@ -110,24 +144,15 @@ public class OptionnalImpl extends ResourceEObjectImpl implements Optionnal {
 	}

 

 	/**

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

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ActivitiesPackage.Literals.OPTIONNAL;

-	}

-

-	/**

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

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

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

 	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch(featureID) {

-		case ActivitiesPackage.OPTIONNAL__BASE_PARAMETER:

+		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

 			setBase_Parameter((Parameter)null);

 			return;

 		}

@@ -135,32 +160,18 @@ public class OptionnalImpl extends ResourceEObjectImpl implements Optionnal {
 	}

 

 	/**

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

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

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

 	 * 

 	 * @generated

 	 */

-	public Parameter getBase_Parameter() {

-		if(base_Parameter != null && base_Parameter.eIsProxy()) {

-			InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;

-			base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);

-			if(base_Parameter != oldBase_Parameter) {

-				if(eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ActivitiesPackage.OPTIONNAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

-			}

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch(featureID) {

+		case ActivitiesPackage.OPTIONAL__BASE_PARAMETER:

+			return base_Parameter != null;

 		}

-		return base_Parameter;

-	}

-

-	/**

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

-	 * 

-	 * @generated

-	 */

-	public void setBase_Parameter(Parameter newBase_Parameter) {

-		Parameter oldBase_Parameter = base_Parameter;

-		base_Parameter = newBase_Parameter;

-		if(eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ActivitiesPackage.OPTIONNAL__BASE_PARAMETER, oldBase_Parameter, base_Parameter));

+		return super.eIsSet(featureID);

 	}

 

-} // OptionnalImpl

+} //OptionalImpl

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
index e4c06622594..0399c733bc4 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesAdapterFactory.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.activities.Continuous;
 import org.eclipse.papyrus.sysml.activities.ControlOperator;

 import org.eclipse.papyrus.sysml.activities.Discrete;

 import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optionnal;

+import org.eclipse.papyrus.sysml.activities.Optional;

 import org.eclipse.papyrus.sysml.activities.Overwrite;

 import org.eclipse.papyrus.sysml.activities.Probability;

 import org.eclipse.papyrus.sysml.activities.Rate;

@@ -55,8 +55,8 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	protected ActivitiesSwitch<Adapter> modelSwitch = new ActivitiesSwitch<Adapter>() {

 

 		@Override

-		public Adapter caseOptionnal(Optionnal object) {

-			return createOptionnalAdapter();

+		public Adapter caseOptional(Optional object) {

+			return createOptionalAdapter();

 		}

 

 		@Override

@@ -132,6 +132,21 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.sysml.activities.Optional <em>Optional</em>}'.

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

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.sysml.activities.Optional

+	 * @generated

+	 */

+	public Adapter createOptionalAdapter() {

+		return null;

+	}

+

+	/**

 	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.activities.Continuous <em>Continuous</em>}'. <!--

 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore

 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--

@@ -200,20 +215,6 @@ public class ActivitiesAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.activities.Optionnal <em>Optionnal</em>}'. <!--

-	 * begin-user-doc --> This default implementation returns null so that we can easily ignore

-	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--

-	 * end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.sysml.activities.Optionnal

-	 * @generated

-	 */

-	public Adapter createOptionnalAdapter() {

-		return null;

-	}

-

-	/**

 	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.sysml.activities.Overwrite <em>Overwrite</em>}'. <!--

 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore

 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
index 7a01f7865ac..33bc0a5d7f0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml/src/org/eclipse/papyrus/sysml/activities/util/ActivitiesSwitch.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.sysml.activities.Continuous;
 import org.eclipse.papyrus.sysml.activities.ControlOperator;

 import org.eclipse.papyrus.sysml.activities.Discrete;

 import org.eclipse.papyrus.sysml.activities.NoBuffer;

-import org.eclipse.papyrus.sysml.activities.Optionnal;

+import org.eclipse.papyrus.sysml.activities.Optional;

 import org.eclipse.papyrus.sysml.activities.Overwrite;

 import org.eclipse.papyrus.sysml.activities.Probability;

 import org.eclipse.papyrus.sysml.activities.Rate;

@@ -121,21 +121,6 @@ public class ActivitiesSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Optionnal</em>'. <!--

-	 * begin-user-doc --> This implementation returns null; returning a non-null result will

-	 * terminate the switch. <!-- end-user-doc -->

-	 * 

-	 * @param object

-	 *        the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Optionnal</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseOptionnal(Optionnal object) {

-		return null;

-	}

-

-	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Overwrite</em>'. <!--

 	 * begin-user-doc --> This implementation returns null; returning a non-null result will

 	 * terminate the switch. <!-- end-user-doc -->

@@ -248,12 +233,12 @@ public class ActivitiesSwitch<T> {
 	 */

 	protected T doSwitch(int classifierID, EObject theEObject) {

 		switch(classifierID) {

-		case ActivitiesPackage.OPTIONNAL:

+		case ActivitiesPackage.OPTIONAL:

 		{

-			Optionnal optionnal = (Optionnal)theEObject;

-			T result = caseOptionnal(optionnal);

+			Optional optional = (Optional)theEObject;

+			T result = caseOptional(optional);

 			if(result == null)

-				result = caseResourceEObject(optionnal);

+				result = caseResourceEObject(optional);

 			if(result == null)

 				result = defaultCase(theEObject);

 			return result;

@@ -337,4 +322,21 @@ public class ActivitiesSwitch<T> {
 		}

 	}

 

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Optional</em>'.

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

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

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

+	 * 

+	 * @param object

+	 *        the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Optional</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseOptional(Optional object) {

+		return null;

+	}

+

 } // ActivitiesSwitch