[509735] Tweak workflow metamodel

Bug: 509735
Change-Id: Ic84041dff40be4a760a806a04a5f26cb14a90d96
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

20 files changed, 87 insertions, 33 deletions

diff --git a/plugins/org.eclipse.sirius.editor.workflow/.classpath b/plugins/org.eclipse.sirius.editor.workflow/.classpath
index 50aae142c5..26e67d64ad 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/.classpath
+++ b/plugins/org.eclipse.sirius.editor.workflow/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.sirius.editor.workflow/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.workflow/META-INF/MANIFEST.MF
index 36a64ecabf..7b156cc8e4 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.workflow/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.sirius.editor.workflow;singleton:=true
 Bundle-Version: 6.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.sirius.editor.workflow.Activator
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.edit.ui;bundle-version="2.3.1",
@@ -19,15 +18,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0",
  org.eclipse.sirius.workflow.model;bundle-version="6.0.0",
  org.eclipse.sirius.ext.swt;bundle-version="6.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.sirius.editor.workflow
-Export-Package: org.eclipse.sirius.editor.workflow,
- org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.activitydescription,
- org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.pagedescription,
- org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.sectiondescription,
- org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.activitydescription,
- org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.pagedescription,
- org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.sectiondescription
+Export-Package: org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.activitydescription;version="6.0.0",
+ org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.pagedescription;version="6.0.0",
+ org.eclipse.sirius.workflow.model.editor.properties.filters.workflow.sectiondescription;version="6.0.0",
+ org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.activitydescription;version="6.0.0",
+ org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.pagedescription;version="6.0.0",
+ org.eclipse.sirius.workflow.model.editor.properties.sections.workflow.sectiondescription;version="6.0.0"
diff --git a/plugins/org.eclipse.sirius.editor.workflow/build.properties b/plugins/org.eclipse.sirius.editor.workflow/build.properties
index 1a73669159..e92269895c 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/build.properties
+++ b/plugins/org.eclipse.sirius.editor.workflow/build.properties
@@ -9,8 +9,7 @@
 #    Obeo - initial API and implementation
 # ====================================================================
 
-source.. = src/,\
-           src-gen/
+source.. = src-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionImagePathFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionImagePathFilter.java
index d81479fdf3..aafb649e42 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionImagePathFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionImagePathFilter.java
@@ -25,6 +25,7 @@ public class ActivityDescriptionImagePathFilter extends ViewpointPropertyFilter
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getActivityDescription_ImagePath();
     }
@@ -32,6 +33,7 @@ public class ActivityDescriptionImagePathFilter extends ViewpointPropertyFilter
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.ActivityDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionLabelExpressionFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionLabelExpressionFilter.java
index f52cee5807..8af394f221 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionLabelExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/activitydescription/ActivityDescriptionLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class ActivityDescriptionLabelExpressionFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getActivityDescription_LabelExpression();
     }
@@ -32,6 +33,7 @@ public class ActivityDescriptionLabelExpressionFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.ActivityDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionDescriptionExpressionFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionDescriptionExpressionFilter.java
index 11a64c851b..98a8268637 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionDescriptionExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionDescriptionExpressionFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionDescriptionExpressionFilter extends ViewpointPropert
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_DescriptionExpression();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionDescriptionExpressionFilter extends ViewpointPropert
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.PageDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionImagePathFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionImagePathFilter.java
index 6a8cd5d5d7..d95a4174b6 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionImagePathFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionImagePathFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionImagePathFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_ImagePath();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionImagePathFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.PageDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionTitleExpressionFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionTitleExpressionFilter.java
index 24c9110b1f..db624b4640 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionTitleExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/pagedescription/PageDescriptionTitleExpressionFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionTitleExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_TitleExpression();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionTitleExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.PageDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionDescriptionExpressionFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionDescriptionExpressionFilter.java
index 39ce3b5beb..5c94c49a79 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionDescriptionExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionDescriptionExpressionFilter.java
@@ -25,6 +25,7 @@ public class SectionDescriptionDescriptionExpressionFilter extends ViewpointProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_DescriptionExpression();
     }
@@ -32,6 +33,7 @@ public class SectionDescriptionDescriptionExpressionFilter extends ViewpointProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.SectionDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionImagePathFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionImagePathFilter.java
index 891de9c43b..4448938744 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionImagePathFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionImagePathFilter.java
@@ -25,6 +25,7 @@ public class SectionDescriptionImagePathFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_ImagePath();
     }
@@ -32,6 +33,7 @@ public class SectionDescriptionImagePathFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.SectionDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionTitleExpressionFilter.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionTitleExpressionFilter.java
index 5142017543..9ddc136c67 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionTitleExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/filters/workflow/sectiondescription/SectionDescriptionTitleExpressionFilter.java
@@ -25,6 +25,7 @@ public class SectionDescriptionTitleExpressionFilter extends ViewpointPropertyFi
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_TitleExpression();
     }
@@ -32,6 +33,7 @@ public class SectionDescriptionTitleExpressionFilter extends ViewpointPropertyFi
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.workflow.SectionDescription;
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionImagePathPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionImagePathPropertySection.java
index d4954029de..34276de93d 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionImagePathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionImagePathPropertySection.java
@@ -29,6 +29,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ImagePath"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getActivityDescription_ImagePath();
     }
@@ -55,6 +58,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -81,6 +87,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 String imagePath = WorkspaceAndPluginsResourceDialog.openDialogForImages(composite.getShell());
                 if (imagePath != null) {
@@ -94,6 +101,7 @@ public class ActivityDescriptionImagePathPropertySection extends AbstractTextWit
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionLabelExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionLabelExpressionPropertySection.java
index 315ec8ce41..1377f7e614 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionLabelExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/activitydescription/ActivityDescriptionLabelExpressionPropertySection.java
@@ -33,6 +33,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LabelExpression"; //$NON-NLS-1$
     }
@@ -40,6 +41,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -52,6 +54,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getActivityDescription_LabelExpression();
     }
@@ -59,6 +62,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -66,6 +70,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -73,6 +78,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -95,6 +101,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ActivityDescriptionLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -107,6 +114,7 @@ public class ActivityDescriptionLabelExpressionPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionDescriptionExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionDescriptionExpressionPropertySection.java
index 6d9146bd28..a882ff26bb 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionDescriptionExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionDescriptionExpressionPropertySection.java
@@ -33,6 +33,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DescriptionExpression"; //$NON-NLS-1$
     }
@@ -40,6 +41,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -52,6 +54,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_DescriptionExpression();
     }
@@ -59,6 +62,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -66,6 +70,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -73,6 +78,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -95,6 +101,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), PageDescriptionDescriptionExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -107,6 +114,7 @@ public class PageDescriptionDescriptionExpressionPropertySection extends Abstrac
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionImagePathPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionImagePathPropertySection.java
index ba1e8fba08..7cd7ff5c79 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionImagePathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionImagePathPropertySection.java
@@ -29,6 +29,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ImagePath"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_ImagePath();
     }
@@ -55,6 +58,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -81,6 +87,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 String imagePath = WorkspaceAndPluginsResourceDialog.openDialogForImages(composite.getShell());
                 if (imagePath != null) {
@@ -94,6 +101,7 @@ public class PageDescriptionImagePathPropertySection extends AbstractTextWithBut
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionTitleExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionTitleExpressionPropertySection.java
index 0337ad5d44..3791ed456f 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionTitleExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/pagedescription/PageDescriptionTitleExpressionPropertySection.java
@@ -33,6 +33,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "TitleExpression"; //$NON-NLS-1$
     }
@@ -40,6 +41,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -52,6 +54,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getPageDescription_TitleExpression();
     }
@@ -59,6 +62,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -66,6 +70,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -73,6 +78,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -95,6 +101,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), PageDescriptionTitleExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -107,6 +114,7 @@ public class PageDescriptionTitleExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionDescriptionExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionDescriptionExpressionPropertySection.java
index 6bf1793106..15d1a76d9c 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionDescriptionExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionDescriptionExpressionPropertySection.java
@@ -33,6 +33,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DescriptionExpression"; //$NON-NLS-1$
     }
@@ -40,6 +41,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -52,6 +54,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_DescriptionExpression();
     }
@@ -59,6 +62,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -66,6 +70,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -73,6 +78,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -95,6 +101,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), SectionDescriptionDescriptionExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -107,6 +114,7 @@ public class SectionDescriptionDescriptionExpressionPropertySection extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionImagePathPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionImagePathPropertySection.java
index c810381368..a9f0b7d252 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionImagePathPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionImagePathPropertySection.java
@@ -29,6 +29,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ImagePath"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_ImagePath();
     }
@@ -55,6 +58,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -81,6 +87,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 String imagePath = WorkspaceAndPluginsResourceDialog.openDialogForImages(composite.getShell());
                 if (imagePath != null) {
@@ -94,6 +101,7 @@ public class SectionDescriptionImagePathPropertySection extends AbstractTextWith
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionTitleExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionTitleExpressionPropertySection.java
index 4090ae4dba..82c48a1ab4 100644
--- a/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionTitleExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor.workflow/src-gen/org/eclipse/sirius/workflow/model/editor/properties/sections/workflow/sectiondescription/SectionDescriptionTitleExpressionPropertySection.java
@@ -33,6 +33,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "TitleExpression"; //$NON-NLS-1$
     }
@@ -40,6 +41,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -52,6 +54,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return WorkflowPackage.eINSTANCE.getSectionDescription_TitleExpression();
     }
@@ -59,6 +62,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -66,6 +70,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * @see org.eclipse.sirius.workflow.model.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -73,6 +78,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -95,6 +101,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), SectionDescriptionTitleExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -107,6 +114,7 @@ public class SectionDescriptionTitleExpressionPropertySection extends AbstractTe
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/plugins/org.eclipse.sirius.editor.workflow/src/org/eclipse/sirius/editor/workflow/Activator.java b/plugins/org.eclipse.sirius.editor.workflow/src/org/eclipse/sirius/editor/workflow/Activator.java
deleted file mode 100644
index ffd9a382ae..0000000000
--- a/plugins/org.eclipse.sirius.editor.workflow/src/org/eclipse/sirius/editor/workflow/Activator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.sirius.editor.workflow;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-    @Override
-    public void start(BundleContext context) throws Exception {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        // TODO Auto-generated method stub
-
-    }
-
-}