[releng] Update plugin version for Oxygen release

- Update plugin version numbers using Neon.3 as baseline
- Add appropriate @since annotations to non-generated code

Change-Id: I731bd059466c0caa4b5e0bf0576f0ff5d31f8967

135 files changed, 507 insertions, 168 deletions

diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
index de5746cd75a..f43a8742c3b 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
index 93af4fccbb3..826721ba06b 100644
--- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.infra.architecture.representation,
  org.eclipse.papyrus.infra.architecture.representation.util

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
index 92f8d3faec1..ea7895673de 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.constraints.environment.provider,

  org.eclipse.papyrus.infra.constraints.provider

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

+Bundle-Version: 2.0.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation

diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
index 72a71e5b1e8..7582f0c9269 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/pom.xml
@@ -6,6 +6,6 @@
 		<version>0.0.1-SNAPSHOT</version>

 	</parent>

 	<artifactId>org.eclipse.papyrus.infra.constraints.edit</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<version>2.0.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
index 226f9a222a1..44b461eec15 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",

  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport

@@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.infra.constraints.environment.presentation,
 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

-Bundle-Version: 3.0.0.qualifier

+Bundle-Version: 2.0.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation

diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
index f4d8c2c2846..d85772a9fd5 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/pom.xml
@@ -6,6 +6,6 @@
 		<version>0.0.1-SNAPSHOT</version>

 	</parent>

 	<artifactId>org.eclipse.papyrus.infra.constraints.editor</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<version>2.0.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
index 16383d712c6..c12541ab765 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",

+Require-Bundle: org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

 Bundle-Vendor: %providerName

 Bundle-Version: 2.0.0.qualifier

diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
index a4582d64417..1546bab99b6 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"

 Bundle-Vendor: %providerName

-Bundle-Version: 3.0.0.qualifier

+Bundle-Version: 2.0.0.qualifier

 Eclipse-BuddyPolicy: dependent

 Bundle-Activator: org.eclipse.papyrus.infra.constraints.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
index 0a423d7a7e6..4b327619b7a 100644
--- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
+++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/pom.xml
@@ -6,6 +6,6 @@
 		<version>0.0.1-SNAPSHOT</version>

 	</parent>

 	<artifactId>org.eclipse.papyrus.infra.constraints</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<version>2.0.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
index 9af74aba617..4d99774d7a8 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java
@@ -142,6 +142,7 @@ public class SashModelUtils {
 	 *
 	 * @param modelSet
 	 * @return
+	 * @since 3.0
 	 */
 	public static Resource getSashResource(ModelSet modelSet) {
 		SashModel model = getSashModel(modelSet);
diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF
index 1c200e63842..454227ba726 100755
--- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
index cc1ab5913c4..6e35079e2c1 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Export-Package: org.eclipse.papyrus.infra.emf.gmf.command,
  org.eclipse.papyrus.infra.emf.internal.gmf;x-internal:=true

 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,

  org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)";visibility:=reexport

 Bundle-Vendor: %providerName

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index 89a73d5e7a8..bfc9a5a953c 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Export-Package: org.eclipse.papyrus.infra.emf,
 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddEAnnotationDetailCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddEAnnotationDetailCommand.java
index 4b490bccf42..f2f3ab86c89 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddEAnnotationDetailCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddEAnnotationDetailCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 
 /**
  * This allows to add a detail into the annotation.
+ * @since 3.0
  */
 public class AddEAnnotationDetailCommand extends RecordingCommand {
 
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java
index 77af3a715fc..7579b57cebe 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java
@@ -47,6 +47,7 @@ public class AddToResourceCommand extends AbstractTransactionalCommand {
 	 *            the resource
 	 * @param toAdd
 	 *            the object to add to the resource
+	 * @since 3.0
 	 */
 	public AddToResourceCommand(final TransactionalEditingDomain domain, final Resource resource, final EObject toAdd) {
 		super(domain, "Add an object to a resource", null);
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
index 45ad03b71da..8aa547e82eb 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibili
  org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/EObjectStructuredObservableValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/EObjectStructuredObservableValue.java
index 7bbd0f3f823..72106fb17dc 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/EObjectStructuredObservableValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/EObjectStructuredObservableValue.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.transaction.util.TransactionUtil;
 
 /**
  * Structured ObservableValue.
+ * @since 2.0
  */
 public class EObjectStructuredObservableValue extends EMFObservableValue {
 
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/MultipleCellEditor.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/MultipleCellEditor.java
index abae3e7678c..949c8d21a3d 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/MultipleCellEditor.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/databinding/MultipleCellEditor.java
@@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Control;
 
 /**
  * A CellEditor uses to set multiple values of an object.
+ * @since 2.0
  */
 public class MultipleCellEditor extends DialogCellEditor {
 
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EObjectObservableValueLabelProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EObjectObservableValueLabelProvider.java
index 6df791cfd22..b2949f4b120 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EObjectObservableValueLabelProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/EObjectObservableValueLabelProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.edit.ui.provider.DelegatingStyledCellLabelProvider;
 
 /**
  * LabelProvider used to show feature name and EObject of an EObjectObservaleValue.
+ * @since 2.0
  *
  */
 public class EObjectObservableValueLabelProvider extends DelegatingStyledCellLabelProvider {
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java
index ef248a45bee..5c3679822b7 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/utils/EcoreModelContentProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.viewers.Viewer;
  * Represents a content provider for a hierarchy of Ecore objects
  *
  * @author Laurent Wouters
+ * @since 2.0
  */
 public class EcoreModelContentProvider implements ITreeContentProvider {
 	/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
index e67e62e91f7..bc39b3a4611 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/GMFToCSSConverter.java
@@ -93,6 +93,9 @@ public class GMFToCSSConverter {
 		return getExpression(stringValue);
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public List<CssTok> convert(Double doubleValue) {
 		NumberTok numberValue = CSSFactory.eINSTANCE.createNumberTok();
 		numberValue.setVal(doubleValue);
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSClassContentProvider.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSClassContentProvider.java
index ec0f067cfa7..3f85a121332 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSClassContentProvider.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/provider/CSSClassContentProvider.java
@@ -98,6 +98,9 @@ public class CSSClassContentProvider extends AbstractStaticContentProvider {
 		return result;
 	}
 
+	/**
+	 * @since 2.1
+	 */
 	protected List<String> findClassesFromSelector(Selector selector) {
 		List<String> result = new LinkedList<String>();
 		if (selector instanceof ConditionalSelector) {
@@ -112,6 +115,9 @@ public class CSSClassContentProvider extends AbstractStaticContentProvider {
 		return result;
 	}
 
+	/**
+	 * @since 2.1
+	 */
 	protected List<String> findClassesFromSelector(ConditionalSelector selector) {
 		List<String> result = new LinkedList<String>();
 
@@ -129,6 +135,9 @@ public class CSSClassContentProvider extends AbstractStaticContentProvider {
 		return result;
 	}
 
+	/**
+	 * @since 2.1
+	 */
 	protected List<String> findClassesFromCondition(Condition condition) {
 		if (condition instanceof CSSClassConditionImpl) {
 			return Collections.singletonList(((CSSClassConditionImpl) condition).getValue());
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
index 5b4d91b8394..26a33397b94 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"

 Export-Package: org.eclipse.papyrus.extensionpoints.editors,

  org.eclipse.papyrus.extensionpoints.editors.configuration,

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
index 834f4b813cb..a2dd99eafec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorExtensionPoint.java
@@ -66,6 +66,9 @@ public class DirectEditorExtensionPoint implements IDirectEditorExtensionPoint {
 		init();
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	protected void init() {
 		// It was not already computed,
 		// returns the new Collection of DirectEditorExtensionPoint
@@ -93,6 +96,9 @@ public class DirectEditorExtensionPoint implements IDirectEditorExtensionPoint {
 		directEditorProvider.init(configurations);
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public final synchronized static DirectEditorExtensionPoint getInstance() {
 		if (DirectEditorExtensionPoint.instance == null) {
 			DirectEditorExtensionPoint.instance = new DirectEditorExtensionPoint();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleWithStoreObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleWithStoreObservableValue.java
index c7b8a245550..be0682817bb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleWithStoreObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomBooleanStyleWithStoreObservableValue.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 /**
  *
  * Implementation for an ObservableValue associated to a BooleanValueStyle and a IPreferenceStore.
+ * @since 3.0
  *
  */
 public class CustomBooleanStyleWithStoreObservableValue extends CustomBooleanStyleObservableValue {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
index c9a2fffc2bf..5a2e75d4f4e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleObservableValue.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.notation.View;
 /**
  *
  * Implementation for an ObservableValue associated to a GMF custom style (DoubleValueStyle).
+ * @since 3.0
  *
  */
 public class CustomDoubleStyleObservableValue extends AbstractCustomStyleObservableValue {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleWithStoreObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleWithStoreObservableValue.java
index e45f2277157..a7a318c4284 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleWithStoreObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomDoubleStyleWithStoreObservableValue.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 /**
  *
  * Implementation for an ObservableValue associated to a DoubleValueStyle and a IPreferenceStore.
+ * @since 3.0
  *
  */
 public class CustomDoubleStyleWithStoreObservableValue extends CustomDoubleStyleObservableValue {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleWithStoreObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleWithStoreObservableValue.java
index fc96e7b0330..22c2f55a266 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleWithStoreObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/CustomIntStyleWithStoreObservableValue.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 /**
  *
  * Implementation for an ObservableValue associated to a IntValueStyle and a IPreferenceStore.
+ * @since 3.0
  *
  */
 public class CustomIntStyleWithStoreObservableValue extends CustomIntStyleObservableValue {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RulersUnitStyleObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RulersUnitStyleObservableValue.java
index 13a41b15c34..9d3df99156a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RulersUnitStyleObservableValue.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/RulersUnitStyleObservableValue.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConverterUtils;
  *
  * Implementation for an ObservableValue corresponding to the property "rulergrid.rulerunit".
  * This ObservableValue is associated to a IntValueStyle and a IPreferenceStore.
+ * @since 3.0
  *
  */
 @SuppressWarnings("restriction")
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/BorderedScalableImageFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/BorderedScalableImageFigure.java
index a2aaa1fa711..f8baab40cfe 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/BorderedScalableImageFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/BorderedScalableImageFigure.java
@@ -39,6 +39,9 @@ public class BorderedScalableImageFigure extends ScalableImageFigure {
 		this(renderedImage, useDefaultImageSize, useOriginalColors, antiAlias, true);
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public BorderedScalableImageFigure(RenderedImage renderedImage, boolean useDefaultImageSize, boolean useOriginalColors, boolean antiAlias, boolean isModificationPreferredSize) {
 		super(renderedImage, useDefaultImageSize, useOriginalColors, antiAlias);
 		// set a layout manager to override maintain ratio behavior
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
index c72496a6e3c..95f1dc6f7b7 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramPrototype.java
@@ -36,6 +36,9 @@ public class DiagramPrototype extends ViewPrototype {
 	protected final String category;
 	protected final AbstractPapyrusGmfCreateDiagramCommandHandler command;
 
+	/**
+	 * @since 3.0
+	 */
 	public DiagramPrototype(PapyrusDiagram configuration, String category, AbstractPapyrusGmfCreateDiagramCommandHandler command) {
 		super(configuration);
 		this.category = category;
@@ -137,6 +140,9 @@ public class DiagramPrototype extends ViewPrototype {
 		return ((Diagram) view).getElement();
 	}
 	
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	public PapyrusDiagram getRepresentationKind() {
 		return (PapyrusDiagram) representationKind;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
index 3846265feb5..b8a157cb41b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/NotationHelper.java
@@ -97,24 +97,27 @@ public class NotationHelper {
 	}

 

 	/**

-	 * get the absolute position form the notation 

-	 * @param node the current node

+	 * get the absolute position form the notation

+	 * 

+	 * @param node

+	 *            the current node

 	 * @return

+	 * @since 3.0

 	 */

-	public static PrecisionRectangle getAbsoluteBounds(Node node){

-		if(node.getLayoutConstraint() instanceof Bounds){

-			PrecisionRectangle bounds= new PrecisionRectangle( ((Bounds)node.getLayoutConstraint()).getX(),((Bounds)node.getLayoutConstraint()).getY(),((Bounds)node.getLayoutConstraint()).getWidth(), ((Bounds)node.getLayoutConstraint()).getHeight());

+	public static PrecisionRectangle getAbsoluteBounds(Node node) {

+		if (node.getLayoutConstraint() instanceof Bounds) {

+			PrecisionRectangle bounds = new PrecisionRectangle(((Bounds) node.getLayoutConstraint()).getX(), ((Bounds) node.getLayoutConstraint()).getY(), ((Bounds) node.getLayoutConstraint()).getWidth(), ((Bounds) node.getLayoutConstraint()).getHeight());

 			EObject currentView = (EObject) node.eContainer();

-			while (currentView!=null){

-			

-			if (currentView instanceof Node){

-				Point ptCurrenview= new Point( ((Bounds)((Node)currentView).getLayoutConstraint()).getX(),((Bounds)((Node)currentView).getLayoutConstraint()).getY());

-				bounds.translate(ptCurrenview);

+			while (currentView != null) {

+

+				if (currentView instanceof Node) {

+					Point ptCurrenview = new Point(((Bounds) ((Node) currentView).getLayoutConstraint()).getX(), ((Bounds) ((Node) currentView).getLayoutConstraint()).getY());

+					bounds.translate(ptCurrenview);

 				}

-			currentView= currentView.eContainer();

+				currentView = currentView.eContainer();

 			}

 			return bounds;

-		}

-		else return null;

+		} else

+			return null;

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/ReconcileHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/ReconcileHelper.java
index bb32d4b576c..35c86ae3af0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/ReconcileHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/ReconcileHelper.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtil
 
 /**
  * Diagram migration between version of Papyrus.
+ * @since 3.0
  */
 public class ReconcileHelper {
 	
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java
index c2a11d8dff2..f0ddf85e7b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java
@@ -92,39 +92,81 @@ public class Messages extends NLS {
 	public static String PastePreferencesPage_KeepReferenceDescription;
 
 	// Palette UI //
-	/** LAbel for the standard group */
+	/** LAbel for the standard group 
+	 * @since 3.0*/
 	public static String StandardGroup_Label;
 
-	/** label for the palette action in the palette viewer menu */
+	/** label for the palette action in the palette viewer menu 
+	 * @since 3.0*/
 	public static String Palette_Action_Label;
 
-	/** tooltip for the palette action in the palette viewer menu */
+	/** tooltip for the palette action in the palette viewer menu 
+	 * @since 3.0*/
 	public static String Palette_Action_Tooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PaletteUtil_ErrorMessage_CantReadLocalDefinitionOfFile;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PaletteUtil_ErrorMessage_NoLocalDefinition;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PaletteUtil_ErrorMessage_NoRedefinitionFoundWithId;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PaletteUtil_ErrorMessage_PaletteNullOnContribution;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PapyrusPalettePreferences_Error_ImpossibleToFindPalette;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PapyrusPalettePreferences_Error_ImpossibleToFindPaletteInWS;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PapyrusPalettePreferences_Error_ImpossibleToReadPreferences;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String PapyrusPalettePreferences_ErrorDuringCreation;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String LocalExtendedPaletteProvider_Error_ImpossibleToLoadRessource;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String WorkspaceExtendedPaletteProvider_ImpossibleToReadResourcePalette;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ResizeBindingPreferencePage_PageTitle;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ResizeBindingPreferencePage_PageDescription;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ResizeBindingPreferencePage_HoldingShiftToRecalculateAnchorPositionWhenResizing;
 
 	static {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
index 26c23e748e4..342d3f838e8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/model/NotationUtils.java
@@ -436,6 +436,7 @@ public class NotationUtils {
 	 * @param defaultDouble
 	 *            the default double
 	 * @return double corresponding to the property
+	 * @since 3.0
 	 */
 	public static double getDoubleValue(final View view, final String property, final double defaultDouble) {
 		double value = defaultDouble;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ResizeBindingPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ResizeBindingPreferenceInitializer.java
index ea3d9204d4b..5bb5fc0d535 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ResizeBindingPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/ResizeBindingPreferenceInitializer.java
@@ -17,6 +17,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 
 /**
  * Initializer for the resize binding preference page.
+ * @since 3.0
  */
 public class ResizeBindingPreferenceInitializer extends AbstractPreferenceInitializer {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DefaultElementTypeIconProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DefaultElementTypeIconProvider.java
index 767c78512c7..9b913fd3565 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DefaultElementTypeIconProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DefaultElementTypeIconProvider.java
@@ -39,6 +39,9 @@ public class DefaultElementTypeIconProvider extends AbstractProvider implements
 		return myElementTypes;
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public final DiagramElementTypeImages getElementTypeImages() {
 		return myElementTypes.getElementTypeImages();
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DiagramElementTypes.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DiagramElementTypes.java
index 16ab8058845..ef82393adc6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DiagramElementTypes.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/DiagramElementTypes.java
@@ -31,6 +31,9 @@ public abstract class DiagramElementTypes {
 		this(new DiagramElementTypeImages(adapterFactory));
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public DiagramElementTypes(DiagramElementTypeImages images) {
 		myImages = images;
 	}
@@ -41,6 +44,9 @@ public abstract class DiagramElementTypes {
 
 	public abstract ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter);
 
+	/**
+	 * @since 3.0
+	 */
 	public DiagramElementTypeImages getElementTypeImages() {
 		return myImages;
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
index 090bf0a9595..754d1f34b13 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
@@ -45,6 +45,9 @@ public class StyleBasedShapeProvider extends AbstractShapeProvider {
 
 	protected static final String STYLE_PROPERTY = "svgFile"; //$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	protected static final String IMAGE_PATH_PROPERTY = "imagePath"; //$NON-NLS-1$
 
 	private ProviderNotificationManager manager;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java
index aa264d747a9..713e1ac70b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/reconciler/DiagramReconciler_1_3_0.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle;
 /**
  * Diagram reconciler form 1.2.0 to 1.3.0 that replaces the old PapyrusViewStyle
  * by the new PapyrusDiagramStyle
+ * @since 3.0
  */
 public abstract class DiagramReconciler_1_3_0 extends DiagramReconciler {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectCreationEntry.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectCreationEntry.java
index c158568096c..30eacb955bd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectCreationEntry.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectCreationEntry.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
  *
  *****************************************************************************/
 
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 
 /**
  * Entry that uses the functionality of another entry.
+ * @since 3.0
  */
 public class AspectCreationEntry extends CombinedTemplateCreationEntry implements Cloneable {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeConnectionTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeConnectionTool.java
index 38f1e39d97d..95decf4eab0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeConnectionTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeConnectionTool.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST)
  *  Mathieu Velten (Atos) mathieu.velten@atos.net - use commands instead of running code in post commit
  *  Philippe ROLAND (Atos) philippe.roland@atos.net - Implemented PreActions
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -63,6 +63,7 @@ import org.w3c.dom.Node;
 
 /**
  * Connection tool that adds stereotype application after creation actions.
+ * @since 3.0
  */
 public class AspectUnspecifiedTypeConnectionTool extends UnspecifiedTypeConnectionTool {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeCreationTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeCreationTool.java
index 8fcf133a458..b24cc20edd4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeCreationTool.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/AspectUnspecifiedTypeCreationTool.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *  Mathieu Velten (Atos) mathieu.velten@atos.net - use commands instead of running code in post commit
  *  Philippe ROLAND (Atos) philippe.roland@atos.net - Implemented PreActions
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.com and remove aspect actions framework, see bug 512343.
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -56,6 +56,7 @@ import org.eclipse.swt.SWT;
 
 /**
  * Creation tool for papyrus.
+ * @since 3.0
  */
 public class AspectUnspecifiedTypeCreationTool extends UnspecifiedTypeCreationTool {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPaletteProviderConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPaletteProviderConfiguration.java
index d6e6a0362f2..0a22e675777 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPaletteProviderConfiguration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPaletteProviderConfiguration.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 
 /**
  * A provider configuration for the PapyrusPaletteService.
+ * @since 3.0
  */
 public class ExtendedPaletteProviderConfiguration extends XMLPaletteProviderConfiguration {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java
index f7428fc2d41..3e59be748f6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java
@@ -78,6 +78,7 @@ import org.osgi.framework.Bundle;
 
 /**
  * Palette provider with enhanced elements types
+ * @since 3.0
  */
 public class ExtendedPluginPaletteProvider extends AbstractProvider implements IPaletteProvider, IProfileDependantPaletteProvider {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPaletteDescription.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPaletteDescription.java
index 593e654aaaa..3498fad67de 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPaletteDescription.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPaletteDescription.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common and remove aspect actions framework, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common and remove aspect actions framework, see bug 512343.
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
 
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
 
 /**
  * Interface that describes a palette.
+ * @since 3.0
  */
 public interface IPaletteDescription {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPapyrusPaletteConstant.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPapyrusPaletteConstant.java
index d2a0c4ed5e3..c3311d017f2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPapyrusPaletteConstant.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IPapyrusPaletteConstant.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common and remove aspect actions framework, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common and remove aspect actions framework, see bug 512343.
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 
 /**
  * Constant for the papyrus palette extension point
+ * @since 3.0
  */
 public interface IPapyrusPaletteConstant {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IProfileDependantPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IProfileDependantPaletteProvider.java
index efb75ce96fe..b119526fbc7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IProfileDependantPaletteProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/IProfileDependantPaletteProvider.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
 
@@ -19,6 +19,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
 /**
  * Interface implemented by all palette providers that requires some profiles
  * applied to be shown
+ * @since 3.0
  */
 public interface IProfileDependantPaletteProvider extends IPaletteProvider {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteConfigurationUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteConfigurationUtils.java
index c96b15e99d4..d641952230a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteConfigurationUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteConfigurationUtils.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
 
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.util.Paletteconfig
 
 /**
  * Utility class for {@link PaletteConfiguration} elements.
+ * @since 3.0
  */
 public class PaletteConfigurationUtils {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteContextMenuProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteContextMenuProvider.java
index f354457509a..5c89758f1bd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteContextMenuProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteContextMenuProvider.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaäl ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - Move from oep.uml.diagram.common, see bug 512343.
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -20,6 +20,7 @@ import org.eclipse.jface.action.IMenuManager;
 
 /**
  * Specific context menu provider for Papyrus diagrams
+ * @since 3.0
  */
 public class PapyrusPaletteContextMenuProvider extends PaletteContextMenuProvider {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteCustomizer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteCustomizer.java
index 94865c07c41..53ace6f1467 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteCustomizer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteCustomizer.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
  *
  *****************************************************************************/
 
@@ -42,6 +42,7 @@ import org.eclipse.ui.XMLMemento;
 
 /**
  * Customizer for the palette viewer
+ * @since 3.0
  */
 public class PapyrusPaletteCustomizer extends PaletteCustomizerEx {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteDescription.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteDescription.java
index 543f1a4e86a..ddfb19d6ec0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteDescription.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteDescription.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -21,6 +21,7 @@ import org.eclipse.ui.IMemento;
 
 /**
  * Class that defines a profile for a palette.
+ * @since 3.0
  */
 public class PapyrusPaletteDescription implements IPaletteDescription {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteEntryState.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteEntryState.java
index 9812aac9f1d..f93170d1265 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteEntryState.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteEntryState.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
  *****************************************************************************/
 
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -20,6 +20,7 @@ import org.eclipse.ui.IMemento;
 
 /**
  * Extended palette state, that also manages parent modification, etc.
+ * @since 3.0
  */
 public class PapyrusPaletteEntryState extends PaletteEntryState {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteViewer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteViewer.java
index 27c0f79cde6..611b4f9023b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteViewer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteViewer.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Shell;
 
 /**
  * Extended Palette Viewer, to have a new customize dialog
+ * @since 3.0
  */
 public class PapyrusPaletteViewer extends PaletteViewerEx {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/XMLPaletteProviderConfiguration.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/XMLPaletteProviderConfiguration.java
index d5d4807e19b..54dbaab3a82 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/XMLPaletteProviderConfiguration.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/XMLPaletteProviderConfiguration.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
  *
  *****************************************************************************/
 
@@ -23,6 +23,7 @@ import org.eclipse.ui.IEditorPart;
 
 /**
  * A provider configuration for the PapyrusPaletteService.
+ * @since 3.0
  */
 public class XMLPaletteProviderConfiguration extends AbstractProviderConfiguration {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
index d8d91365697..f16c11262a4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
@@ -1007,6 +1007,9 @@ public class DiagramEditPartsUtil {
 		return isReadOnly;
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	protected static ILabelProvider labelProvider;
 
 	/**
@@ -1015,6 +1018,7 @@ public class DiagramEditPartsUtil {
 	 * @param parserElement the parserElement, typically the (model) element of an edit part
 	 * @param viewer the edit part viewer
 	 * @return the icon element
+	 * @since 3.0
 	 */
 	public static Image getIcon(EObject parserElement, EditPartViewer viewer) {
 		// EObject parserElement = getParserElement();
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
index 89e2596f9e7..c6ed9ac2761 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/LayoutUtils.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
+ *  Micka�l ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.utils;
 
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 
 /**
  * This class provides utilities for the layout actions
+ * @since 3.0
  */
 public class LayoutUtils {
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/NamedStyleProperties.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/NamedStyleProperties.java
index 12b5e9326f5..577b0512c7e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/NamedStyleProperties.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/NamedStyleProperties.java
@@ -174,15 +174,19 @@ public interface NamedStyleProperties {
 	/** name of the CSS property that manages the enablement of the {@link StyleBasedShapeProvider} for decoration */
 	public static final String SHAPE_DECORATION_STYLE_PROPERTY = "shapeDecorationStyle"; //$NON-NLS-1$
 
-	/** NameStyle property to show an icon next to the label of an element. */
+	/** NameStyle property to show an icon next to the label of an element. 
+	 * @since 3.0*/
 	public static final String ELEMENT_ICON = "elementIcon"; //$NON-NLS-1$
 
-	/** NameStyle property to define the depth of the qualified name to display. */
+	/** NameStyle property to define the depth of the qualified name to display. 
+	 * @since 3.0*/
 	public static final String QUALIFIED_NAME_DEPTH = "qualifiedNameDepth"; //$NON-NLS-1$
 
-	/** NameStyle property to display a shadow under the shape. */
+	/** NameStyle property to display a shadow under the shape. 
+	 * @since 3.0*/
 	public static final String SHADOW = "shadow"; //$NON-NLS-1$
 
-	/** NamedStyle property used to show an image on the symbol compartment. */
+	/** NamedStyle property used to show an image on the symbol compartment. 
+	 * @since 3.0*/
 	public static final String IMAGE_PATH = "imagePath"; //$NON-NLS-1$
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/DialogDisplayUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/DialogDisplayUtils.java
index aedce33140b..a34fb875db6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/DialogDisplayUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/DialogDisplayUtils.java
@@ -21,6 +21,9 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 
+/**
+ * @since 2.0
+ */
 public class DialogDisplayUtils {
 	/**
 	 * Returns the active workbench shell
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/actions/ExportAllDiagramsDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/actions/ExportAllDiagramsDialog.java
index 36c9552901c..33c021423b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/actions/ExportAllDiagramsDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/actions/ExportAllDiagramsDialog.java
@@ -42,6 +42,7 @@ public class ExportAllDiagramsDialog extends Dialog {
 	 *            the parent shell
 	 * @param initialOutputDirectory
 	 *            the initial output directory
+	 * @since 2.0
 	 */
 	public ExportAllDiagramsDialog(Shell parentShell, IResource initialOuputDirectory) {
 		super(parentShell);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportDiagramsPage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportDiagramsPage.java
index 7ae9206c583..b1ca36c97e1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportDiagramsPage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportDiagramsPage.java
@@ -34,6 +34,7 @@ public class ExportDiagramsPage extends WizardPage {
 
 	/**
 	 * Create the wizard.
+	 * @since 2.0
 	 */
 	public ExportDiagramsPage(IResource outputDirectory) {
 		super(Messages.ExportDiagramsPage_0);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
index d77127290bf..4af7834512f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
@@ -58,6 +58,7 @@ public class RulerAndGridModelElement extends AbstractModelElement {
 
 	/**
 	 * The editing domain.
+	 * @since 3.0
 	 */
 	protected EditingDomain domain;
 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
index 95750880ae1..ceb334ca19c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

  org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
index 2cba963bcc6..ba5d0a69229 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation,
 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
index 62dbf9068e1..1749b34321d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

  org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
index 785143aea62..b72f9050b78 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.xmi;visibility:=reexport,

  org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.gmf.runtime.notation;visibility:=reexport,

  org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF
index 48dd3e29eeb..eca31bf9873 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
index 548b6c0ca27..83a65b2c1d1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/api/TableEditorCreationHelper.java
@@ -356,6 +356,7 @@ public class TableEditorCreationHelper {
 	 *            a view {@link TableViewPrototype}, must not be <code>null</code>
 	 * @return
 	 * 		a TableConfiguration, or <code>null</code> if not found
+	 * @since 3.0
 	 */
 	protected TableConfiguration getTableConfiguration(TableViewPrototype viewPrototype) {
 		Assert.isNotNull(viewPrototype);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
index 7e03e254938..8fbbdc8f8b5 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/PolicyDefinedTableHandler.java
@@ -36,6 +36,9 @@ public class PolicyDefinedTableHandler extends CreateNatTableEditorHandler {
 	private EObject context;
 	private String name;
 
+	/**
+	 * @since 3.0
+	 */
 	public PolicyDefinedTableHandler(TableConfiguration config, EObject context, String name) {
 		this.configuration = config;
 		this.context = context;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
index 63e02940f41..91c65dc7534 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
  * Represents the command helper for viewpoints-based generic tables
  *
  * @author Laurent Wouters
+ * @since 3.0
  */
 public class TableCommandHelper implements IViewTypeHelper {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java
index 4c515ac9370..679ccb028a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableReconcileHelper.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 
 /**
  * Table migration between version of Papyrus.
+ * @since 3.0
  */
 public class TableReconcileHelper {
 	
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java
index fbd5a249dad..e8c511a2846 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableReconciler.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
  * <p/>
  * If the suitable reconcilers are found, all of them are asked to update table instance before the first table opening. Planned modifications are provided as an {@link ICommand} instance that allows user to roll-back them all at once.
  * <p/>
+ * @since 3.0
  */
 public abstract class TableReconciler implements IExecutableExtension {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java
index 07098672b9a..2eaec366785 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/reconciler/TableVersioningUtils.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 /**
  * This class provide several convenience methods to tag a table with a version number 
  * or retrieve this version number.
+ * @since 3.0
  */
 public class TableVersioningUtils {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java
index 9e0ed57180e..cd48a0fe2b8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/messages/Messages.java
@@ -24,6 +24,9 @@ public class Messages extends NLS {
 
 	public static String RenameTableHandler_RenameAnExistingTable;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String RenameTableHandler_Label_DialogTitle;
 
 	static {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableLabel.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableLabel.java
index ed3982a21f8..17b08e99dd1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableLabel.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/src/org/eclipse/papyrus/infra/nattable/modelexplorer/queries/GetTableLabel.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.ui.editorsfactory.AbstractGetEditorIconQuery;
 
 /**
  * Return the label of the corresponding table.
+ * @since 3.0
  */
 public class GetTableLabel extends AbstractGetEditorIconQuery implements IJavaQuery2<Table, String> {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index b7c9a6c46d6..e760eb8c197 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.nattable.properties.constraints

 Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.emf.nattable;bundle-version="[3.0.0,4.0.0)",

@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3
  org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)"

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

+Bundle-Version: 2.2.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.properties.Activator

 Bundle-ManifestVersion: 2

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
index b81a370de57..8141d36f713 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>

 	</parent>

 	<artifactId>org.eclipse.papyrus.infra.nattable.properties</artifactId>

-	<version>3.0.0-SNAPSHOT</version>

+	<version>2.2.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
index f8777339adf..c0c76652517 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateColumnElementContraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
 /**

  * The java constraint to define the constraint to create the paste properties from the active nattable editor.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableCanCreateColumnElementContraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
index cfdb1905bd1..23eb949f078 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCanCreateRowElementContraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
 /**

  * The java constraint to define the constraint to create the paste properties from the active nattable editor.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableCanCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
index 51911ba091e..158a5b30b14 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableCantCreateRowElementContraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;
 /**

  * The java constraint to define the constraint to not create the paste properties from the active nattable editor.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableCantCreateRowElementContraint extends EObjectInTableHasTreeFillingConfigurationConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
index 603623b40bb..92ad90320bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnFeatureLabelConfigurationConstraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtil
 /**

  * The java constraint to check if the table from the active nattable editor has a feature column label configuration.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableHasColumnFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
index 1deef6f290b..2c558f1acd1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasColumnObjectLabelConfigurationConstraint.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtil
 /**

  * The java constraint to check if the table from the active nattable editor has an object column label configuration.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableHasColumnObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
index ceaa77de700..ce4019af33a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowFeatureLabelConfigurationConstraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtil
 /**

  * The java constraint to check if the table from the active nattable editor has a feature row label configuration.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableHasRowFeatureLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
index f14f1e25060..14443d282a4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasRowObjectLabelConfigurationConstraint.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtil
 /**

  * The java constraint to check if the table from the active nattable editor has an object row label configuration.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableHasRowObjectLabelConfigurationConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
index 361384b0a87..8a2127069db 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableHasTreeFillingConfigurationConstraint.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
 /**

  * The java constraint to check if the table from the active nattable editor has tree filling configuration for the first depth.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableHasTreeFillingConfigurationConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
index 74751b3a3e1..af1e575023e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableIsFlatTableConstraint.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
 /**

  * The java constraint to check if the table from the active nattable editor is a flat table.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableIsFlatTableConstraint extends EObjectInTableJavaConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
index 868ddb26e48..af9fec261ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/EObjectInTableJavaConstraint.java
@@ -23,7 +23,7 @@ import org.eclipse.ui.IEditorPart;
 /**

  * The java constraint to check if the table from the active nattable editor.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class EObjectInTableJavaConstraint implements JavaQuery {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
index c3b5a88ec40..145a525cdbf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInFlatTableConstraint.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
 /**

  * The constraint which allow to determinate if this is a nattable editor as current editor part and a flat table.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class IsEObjectInFlatTableConstraint extends IsEObjectInTableConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
index f9ef984c602..54785436e94 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTableConstraint.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.IEditorPart;
 /**

  * The constraint which allow to determinate if this is a nattable editor as current editor part.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class IsEObjectInTableConstraint extends AbstractConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
index c41795d8e0a..7f6e52415d3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/IsEObjectInTreeTableConstraint.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
 /**

  * The constraint which allow to determinate if this is a nattable editor as current editor part and a tree table.

  * 

- * @since 3.0

+ * @since 2.2

  */

 public class IsEObjectInTreeTableConstraint extends IsEObjectInTableConstraint {

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
index c1e7c892d54..77572ceb0e9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
index 2cb0ccf0565..fd3bbc675f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.representation,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.nattable.model;visibility:=reexport,
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
index 944487f5e8d..5aba41ac9e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
@@ -80,8 +80,14 @@ public class CommandIds {
 
 	public static final String COMMAND_HIERARCHIC_DISPLAY_STYLE = "org.eclipse.papyrus.infra.nattable.table.hierarchic.style";////$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	public static final String COMMAND_WRAP_TEXT = "org.eclipse.papyrus.infra.nattable.wraptext"; //$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	public static final String COMMAND_AUTO_RESIZE_CELL_HEIGHT = "org.eclipse.papyrus.infra.nattable.autoresize.cellheight"; //$NON-NLS-1$
 
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java
index c951edef329..c78b8268564 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/PapyrusFilterStrategy.java
@@ -230,7 +230,7 @@ public class PapyrusFilterStrategy implements IFilterStrategy<Object>, IDisposab
 				if (matcherCreator != null) {
 					if (value instanceof Collection<?>) {
 						Collection<?> coll = (Collection<?>) value;
-						if(!coll.isEmpty()){
+						if (!coll.isEmpty()) {
 							Iterator<?> iter = coll.iterator();
 							CompositeMatcherEditor<Object> composite = new CompositeMatcherEditor<Object>();
 							composite.setMode(CompositeMatcherEditor.OR);
@@ -272,6 +272,7 @@ public class PapyrusFilterStrategy implements IFilterStrategy<Object>, IDisposab
 	 *            The existing matcher editors.
 	 * @param filterIndexToObjectMap
 	 *            The map of filters by columns.
+	 * @since 3.0
 	 */
 	protected void clearMarcherEditors(final CompositeMatcherEditor<Object> rootMatcherEditor, final Map<Integer, Object> filterIndexToObjectMap) {
 		final Iterator<MatcherEditor<Object>> subMatchersEditor = rootMatcherEditor.getMatcherEditors().iterator();
@@ -325,6 +326,7 @@ public class PapyrusFilterStrategy implements IFilterStrategy<Object>, IDisposab
 	 * @param filterIndexToObjectMap
 	 *            The filters map.
 	 * @return <code>true</code> if the composite matcher editor already exist and is the same than in the filters map, <code>false</code> otherwise.
+	 * @since 3.0
 	 */
 	@SuppressWarnings("rawtypes")
 	protected boolean isCompositeSubMatcherExist(final CompositeMatcherEditor<Object> subCompositeMatcher, final Map<Integer, Object> filterIndexToObjectMap) {
@@ -360,7 +362,7 @@ public class PapyrusFilterStrategy implements IFilterStrategy<Object>, IDisposab
 
 				matchingMode = ((PapyrusTextMatcherEditor) matcherEditor).getPapyrusMode();
 			}
-			
+
 			if (matcherEditor instanceof PapyrusThresholdMatcherEditor) {
 				if (-1 == columnIndex) {
 					columnIndex = ((PapyrusThresholdMatcherEditor) matcherEditor).getColumnIndex();
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java
index 7a392b936e1..1b90907aa51 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/filter/StringMatcherEditorFactory.java
@@ -408,6 +408,7 @@ public class StringMatcherEditorFactory<T> implements IPapyrusMatcherEditorFacto
 	 *
 	 * @param <E>
 	 *            Type of filtered object.
+	 * @since 3.0
 	 */
 	public class PapyrusTextMatcherEditor<E> extends TextMatcherEditor<E> {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
index 10f896fc876..4503714fc11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
@@ -49,6 +49,7 @@ public interface ICompositeAxisManager extends IAxisManager {
 	 *            the config registry used to find the label provider
 	 * @param isRowsSort
 	 *            Boolean to determinate if this is a rows sort.
+	 * @since 3.0
 	 */
 	public void sortAxisByName(final boolean alpabeticOrder, final IConfigRegistry iConfigRegistry, final boolean isRowsSort);
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
index dbe6e678b4d..81c7eb9bece 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
@@ -849,6 +849,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
 	 * Instantiate a new {@link DragSourceListener}.
 	 *
 	 * @return The Drag Listener.
+	 * @since 3.0
 	 */
 	protected DragSourceListener createDragListener() {
 		return new NatTableDragSourceListener(this, natTable, table);
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
index 752a79e79a0..dac2ff4840b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
@@ -120,6 +120,7 @@ public interface INattableModelManager extends ITableAxisElementProvider, IDispo
 	 * This allows to set the label of a table.
 	 * 
 	 * @param label The new label.
+	 * @since 3.0
 	 */
 	public void setTableLabel(final String label);
 	
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
index 998b01da61d..6732b687465 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
@@ -151,10 +151,19 @@ public class Messages extends NLS {
 
 	public static String ConfigureTableCategoriesWizard_DepthFilledByUser;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ContextFeatureContentProvider_CaseSensitiveLabel;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ContextFeatureContentProvider_CaseSensitiveTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ContextFeatureContentProvider_FilterTooltip;
 
 	public static String DeleteNatTableContextAdvice_DestroyNattableCommand;
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/resource/TableResourceHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/resource/TableResourceHelper.java
index a09f26fef4a..76dfe7de78b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/resource/TableResourceHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/resource/TableResourceHelper.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.nattable.utils.TableResourceConstants;
 
 /**
  * The table resource helper needed to install the table support for the '*.table' files resources.
+ * @since 3.0
  */
 public class TableResourceHelper {
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
index aa0490e3540..0a7dae1227a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
@@ -141,11 +141,13 @@ public class NamedStyleConstants {
 
 	/**
 	 * A {@link BooleanValueStyle} used to enable wrap text in the NatTable.
+	 * @since 3.0
 	 */
 	public static final String WRAP_TEXT = "wrapText"; //$NON-NLS-1$
 
 	/**
 	 * A {@link BooleanValueStyle} used to enable auto-resize cell height in the NatTable.
+	 * @since 3.0
 	 */
 	public static final String AUTO_RESIZE_CELL_HEIGHT = "autoResizeCellHeight"; //$NON-NLS-1$
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableResourceConstants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableResourceConstants.java
index bb4d436d01f..7161c23ee6f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableResourceConstants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableResourceConstants.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.nattable.utils;
 
 /**
  * This allows to define the table resource constants needed.
+ * @since 3.0
  */
 public class TableResourceConstants {
 
diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index d95c14c52c6..bfe3613348f 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -260,6 +260,7 @@ public class CreationMenuFactory {
 	 *
 	 * @param currentCreationMenu
 	 * @param item
+	 * @since 3.0
 	 */
 	protected void fillIcon(CreationMenu currentCreationMenu, MenuItem item, IClientContext context) {
 		if (currentCreationMenu.getIcon() != null && !"".equals(currentCreationMenu.getIcon())) {
@@ -283,6 +284,7 @@ public class CreationMenuFactory {
 	 * @param selectedObject
 	 * @param currentCreationMenu
 	 * @return return the list of Ereference that can be calculated
+	 * @since 3.0
 	 */
 	protected ArrayList<EStructuralFeature> getEreferences(EObject selectedObject, CreationMenu currentCreationMenu, IClientContext context) {
 		ArrayList<EStructuralFeature> possibleEFeatures = new ArrayList<>();
@@ -293,7 +295,7 @@ public class CreationMenuFactory {
 			if (eStructuralFeature instanceof EReference) {
 				EReference ref = (EReference) eStructuralFeature;
 				if (ref.isContainment()) {
-					IElementType menuType = getElementType(currentCreationMenu.getElementType(),context);
+					IElementType menuType = getElementType(currentCreationMenu.getElementType(), context);
 					if (menuType != null && isSubClass(ref.getEType(), menuType.getEClass())) {
 						possibleEFeatures.add(eStructuralFeature);
 					}
@@ -330,9 +332,10 @@ public class CreationMenuFactory {
 	 * @param currentCreationMenu
 	 * @param item
 	 *            the current menu
+	 * @since 3.0
 	 */
 	protected void createIconFromElementType(CreationMenu currentCreationMenu, MenuItem item, IClientContext context) {
-		IElementType elementType = getElementType(currentCreationMenu.getElementType(),context);
+		IElementType elementType = getElementType(currentCreationMenu.getElementType(), context);
 		if (elementType != null) {
 			URL iconURL = elementType.getIconURL();
 			if (iconURL != null) {
@@ -378,13 +381,14 @@ public class CreationMenuFactory {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * get the IelementType from a EReference with context check
 	 *
 	 * @param elementType
 	 *            the string that represents the element type
 	 * @return the element type or null
+	 * @since 3.0
 	 * 
 	 */
 	protected IElementType getElementType(ElementTypeConfiguration elementTypeConfiguration, IClientContext context) {
@@ -404,6 +408,7 @@ public class CreationMenuFactory {
 	 * @param adviceCache
 	 * 
 	 * @return a command that can be executed by the domain
+	 * @since 3.0
 	 */
 	protected Command buildCommand(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> adviceCache, IClientContext context) {
 
@@ -413,7 +418,7 @@ public class CreationMenuFactory {
 			return UnexecutableCommand.INSTANCE;
 		}
 
-		IElementType elementType = getElementType(creationMenu.getElementType(),context);
+		IElementType elementType = getElementType(creationMenu.getElementType(), context);
 		if (elementType == null) {
 			return UnexecutableCommand.INSTANCE;
 		}
@@ -450,9 +455,10 @@ public class CreationMenuFactory {
 	 * @param adviceCache
 	 * @return
 	 * 		the creation request to use in this handler
+	 * @since 3.0
 	 */
 	protected CreateElementRequest buildRequest(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> adviceCache, IClientContext context) {
-		IElementType elementtype = getElementType(creationMenu.getElementType(),context);
+		IElementType elementtype = getElementType(creationMenu.getElementType(), context);
 
 		CreateElementRequest request = null;
 		if (reference == null) {
@@ -476,9 +482,10 @@ public class CreationMenuFactory {
 	 *
 	 * @return
 	 * 		the creation request to use in this handler
+	 * @since 3.0
 	 */
 	protected CreateElementRequest buildRequest(EReference reference, EObject container, CreationMenu creationMenu, IClientContext context) {
-		IElementType elementtype = getElementType(creationMenu.getElementType(),context);
+		IElementType elementtype = getElementType(creationMenu.getElementType(), context);
 
 		if (elementtype != null) {
 			if (reference == null) {
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
index 0c23c91750f..06a8a9c4ba6 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
@@ -74,6 +74,7 @@ public class OneFileUtils {
 	 * @param fileName
 	 *            The initial file name.
 	 * @return The base of the di to search in the parent container.
+	 * @since 2.1
 	 */
 	protected static String getFileNameForDi(final String fileName) {
 		String result = fileName;
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
index a6a641089d3..90caf7ecf2c 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.properties.contexts.provider,

  org.eclipse.papyrus.infra.properties.environment.provider,

diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
index bd0323b694c..4a1fc518c78 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,

  org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)",

- org.eclipse.papyrus.infra.constraints.editor;bundle-version="[3.0.0,4.0.0)"

+ org.eclipse.papyrus.infra.constraints.editor;bundle-version="[2.0.0,3.0.0)"

 Export-Package: org.eclipse.papyrus.infra.properties.contexts.presentation,

  org.eclipse.papyrus.infra.properties.environment.presentation,

  org.eclipse.papyrus.infra.properties.ui.presentation

diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EObjectDirectEditingValueFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EObjectDirectEditingValueFactory.java
index d163bbe2d37..bebd1147371 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EObjectDirectEditingValueFactory.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/modelelement/EObjectDirectEditingValueFactory.java
@@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Control;
 
 /**
  * A ReferenceFactory used to instantiate EObjects.
+ * @since 2.0
  */
 public class EObjectDirectEditingValueFactory extends EcorePropertyEditorFactory {
 
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DataTypeEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DataTypeEditor.java
index 38709caac46..a2506b4bb62 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DataTypeEditor.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/DataTypeEditor.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 
 /**
  * This class is used to create a Property Editor based on the DataType.
+ * @since 2.0
  */
 public class DataTypeEditor extends AbstractPropertyEditor {
 
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IconPropertyEditor.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IconPropertyEditor.java
index e22a3cae475..7b8ae8513f9 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IconPropertyEditor.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/IconPropertyEditor.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Composite;
 
 /**
  * The property editor for Icon with popup.
+ * @since 2.0
  */
 public class IconPropertyEditor extends AbstractPropertyEditor {
 
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/TabbedPropertyTitle.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/TabbedPropertyTitle.java
index 2dc6888d377..2cffeefbe7a 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/TabbedPropertyTitle.java
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/widgets/TabbedPropertyTitle.java
@@ -34,6 +34,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
  * The title in the tabbed property sheet page.
  *
  * @author Anthony Hunter
+ * @since 2.0
  */
 public class TabbedPropertyTitle
 		extends Composite {
diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
index 0410174cd6f..59b1e090363 100644
--- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.infra.properties.catalog,
  org.eclipse.papyrus.infra.properties.ui.impl,

  org.eclipse.papyrus.infra.properties.ui.util

 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
index ed0c5389f0b..874fcf6078e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/CreateControlResource.java
@@ -176,6 +176,7 @@ public class CreateControlResource extends AbstractControlResourceCommand {
 	 * @param objectToUncontrol

 	 *            the object to uncontrol

 	 * @return the target resrource

+	 * @since 2.0

 	 */

 	protected Resource getTargetResrource(EObject objectToUncontrol) {

 		return getRequest().getModelSet().getAssociatedResource(objectToUncontrol, getFileExtension(), true);

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
index da2aa0eb187..11081d7381e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/commands/RemoveControlResourceCommand.java
@@ -40,22 +40,28 @@ import org.eclipse.papyrus.infra.services.controlmode.messages.Messages;
  */

 public class RemoveControlResourceCommand extends AbstractControlResourceCommand {

 

-	/** The Constant PREVIOUS_RESOURCE_ERROR. */

+	/** The Constant PREVIOUS_RESOURCE_ERROR. 

+	 * @since 2.0*/

 	protected static final String PREVIOUS_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.previous.resource.error"); //$NON-NLS-1$

 

-	/** The Constant TARGET_RESOURCE_ERROR. */

+	/** The Constant TARGET_RESOURCE_ERROR. 

+	 * @since 2.0*/

 	protected static final String TARGET_RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.target.resource.error"); //$NON-NLS-1$

 

-	/** The Constant RESOURCE_ERROR. */

+	/** The Constant RESOURCE_ERROR. 

+	 * @since 2.0*/

 	protected static final String RESOURCE_ERROR = Messages.getString("RemoveControlResourceCommand.resource.error"); //$NON-NLS-1$

 

-	/** The Constant RESOURCESET_ERROR. */

+	/** The Constant RESOURCESET_ERROR. 

+	 * @since 2.0*/

 	protected static final String RESOURCESET_ERROR = Messages.getString("RemoveControlResourceCommand.resourceset.error"); //$NON-NLS-1$

 

-	/** The Constant CONTROL_OBJECT_ERROR. */

+	/** The Constant CONTROL_OBJECT_ERROR. 

+	 * @since 2.0*/

 	protected static final String CONTROL_OBJECT_ERROR = Messages.getString("RemoveControlResourceCommand.object.error"); //$NON-NLS-1$

 

-	/** The Constant UNCONTROL_COMMAND_TITLE. */

+	/** The Constant UNCONTROL_COMMAND_TITLE. 

+	 * @since 2.0*/

 	protected static final String UNCONTROL_COMMAND_TITLE = Messages.getString("RemoveControlResourceCommand.command.title"); //$NON-NLS-1$

 

 	/**

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
index 8ba599cd9ed..cdceb1f1bbe 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/src/org/eclipse/papyrus/infra/services/controlmode/messages/Messages.java
@@ -1,63 +1,64 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.services.controlmode.messages;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Messages class to access to externalised strings.
- * 
- * @author Gabriel Pascual
- *
- */
-public class Messages {
-
-	/** The Constant BUNDLE_NAME. */
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.messages.messages"; //$NON-NLS-1$
-
-	/** The Constant RESOURCE_BUNDLE. */
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	/**
-	 * Gets the string.
-	 *
-	 * @param key
-	 *            the key
-	 * @return the string
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-
-	/**
-	 * Gets the string.
-	 *
-	 * @param key
-	 *            the key
-	 * @param parameters
-	 *            the parameters
-	 * @return the string
-	 */
-	public static String getString(String key, Object... parameters) {
-		return String.format(getString(key), parameters);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.services.controlmode.messages;

+

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+/**

+ * Messages class to access to externalised strings.

+ * 

+ * @author Gabriel Pascual

+ * @since 2.0

+ *

+ */

+public class Messages {

+

+	/** The Constant BUNDLE_NAME. */

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.controlmode.messages.messages"; //$NON-NLS-1$

+

+	/** The Constant RESOURCE_BUNDLE. */

+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

+

+	private Messages() {

+	}

+

+	/**

+	 * Gets the string.

+	 *

+	 * @param key

+	 *            the key

+	 * @return the string

+	 */

+	public static String getString(String key) {

+		try {

+			return RESOURCE_BUNDLE.getString(key);

+		} catch (MissingResourceException e) {

+			return '!' + key + '!';

+		}

+	}

+

+	/**

+	 * Gets the string.

+	 *

+	 * @param key

+	 *            the key

+	 * @param parameters

+	 *            the parameters

+	 * @return the string

+	 */

+	public static String getString(String key, Object... parameters) {

+		return String.format(getString(key), parameters);

+	}

+}

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java
index 8a5c9b91205..f79c5ecca80 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/context/TypeContext.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.services.edit.messages.Messages;
  * An API that allows getting a GMF client context that corresponds to an architecture context
  * that is applied to a Papyrus model set or one of its owned objects.
  * </pre>
+ * @since 3.0
  */
 public class TypeContext {
 
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationFilter.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationFilter.java
index ef3f2c1eca2..c67a547456e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationFilter.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationFilter.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * This interface is used to identify whether a diagnostician or validation hook is applicable
  * for a given element
+ * @since 3.0
  */
 public interface IValidationFilter {
 	/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationHook.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationHook.java
index e3ab16367eb..4e15e7f9611 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationHook.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/infra/services/validation/IValidationHook.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * A simple hook that can be executed before and after validation commands. A possible
  * use for the former is to register additional constraints.
+ * @since 3.0
  *
  */
 public interface IValidationHook {
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java
index 0711207ad38..99083a98b97 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java
@@ -24,8 +24,14 @@ public interface IAdviceKindExtensionPoint {
 
 	public static final String CONFIGURATION_CLASS = "configurationClass";//$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	public static final String DESCRIPTION = "description";//$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	public static final String ICON = "icon";//$NON-NLS-1$
 
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
index 676a4674ed4..526b838b7da 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
@@ -67,6 +67,7 @@ public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindi
 
 	/**
 	 * @return an instance of the defined advice binding configuration
+	 * @since 3.0
 	 */
 	abstract public AbstractAdviceBindingConfiguration createAdviceBindingConfiguration();
 }
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
index b8c6054aaf6..43af6d3c45e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
@@ -71,7 +71,8 @@ public class ElementTypeSetConfigurationRegistry {
 
 	private volatile static ElementTypeSetConfigurationRegistry elementTypeSetConfigurationRegistry;
 
-	/** Set of registered client contexts */
+	/** Set of registered client contexts 
+	 * @since 3.0*/
 	protected Set<IClientContext> clientContexts = null;
 
 	/** Map of retrieved elementType sets, key is their identifier */
@@ -186,6 +187,9 @@ public class ElementTypeSetConfigurationRegistry {
 		return loadElementTypeSetConfigurations(clientContextID, Collections.singleton(elementTypeSetConfiguration));
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public OrientedGraph<String> getAdvicesDeps(String elementTypeID, String clientContextID) {
 		Map<String, OrientedGraph<String>> allDependencies = advicesDeps.get(clientContextID);
 		if (allDependencies == null) {
@@ -519,6 +523,9 @@ public class ElementTypeSetConfigurationRegistry {
 		return existingDefinitions;
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	protected void readElementTypeSetConfigurationModelsFromArchitectureDomainManager(Map<String, Set<ElementTypeSetConfiguration>> map) {
 		ArchitectureDomainMerger merger = ArchitectureDomainManager.getInstance().getMerger();
 		for (MergedArchitectureDomain domain : merger.getDomains()) {
@@ -531,6 +538,9 @@ public class ElementTypeSetConfigurationRegistry {
 		}
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	protected void listenToArchitectureDomainManager() {
 		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
 		manager.addListener(new ArchitectureDomainManager.Listener() {
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
index 277dfe0476c..7df878c4bd7 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
@@ -27,6 +27,9 @@ public class AdviceComparator implements Comparator<IEditHelperAdvice> {
 	protected Collection<OrientedGraph<String>> dependencies;

 

 

+	/**

+	 * @since 3.0

+	 */

 	public AdviceComparator(IElementType[] types, String contextId) {

 		this.dependencies = new ArrayList<OrientedGraph<String>>();

 		for (IElementType iElementType : types) {

@@ -34,6 +37,9 @@ public class AdviceComparator implements Comparator<IEditHelperAdvice> {
 		}

 	}

 

+	/**

+	 * @since 3.0

+	 */

 	public AdviceComparator(IElementType elementType, String contextId) {

 		this.dependencies = new ArrayList<OrientedGraph<String>>();

 		this.dependencies.add(ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps(elementType.getId(), contextId));

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
index 2988a0b59a7..8e75d1c086f 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
@@ -64,6 +64,9 @@ public class TypesConfigurationsCycleUtil {
 		}

 	}

 

+	/**

+	 * @since 3.0

+	 */

 	static public Map<String, OrientedGraph<String>> getDependenciesAmongAdvices(Collection<AdviceConfiguration> adviceConfigurations) {

 		Map<String, OrientedGraph<String>> adviceDependencies = new HashMap<String, OrientedGraph<String>>();

 		for (AdviceConfiguration adviceConfiguration : adviceConfigurations) {

diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
index 240874d8f23..a5bc30f172c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/WorkbenchPartHelper.java
@@ -38,6 +38,7 @@ public class WorkbenchPartHelper {
 	/**
 	 * @return
 	 * 		The current {@link IWorkbenchPage} or <code>null</code> if not found
+	 * @since 2.0
 	 */
 	public static final IWorkbenchPage getCurrentActiveWorkbenchPage() {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index 9989649bca9..2bd795c621d 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visi
  org.eclipse.e4.ui.model.workbench;bundle-version="[1.2.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.infra.widgets,
  org.eclipse.papyrus.infra.widgets.creation,
  org.eclipse.papyrus.infra.widgets.databinding,
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
index ca43e7d29a0..5ace4576755 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/Activator.java
@@ -30,6 +30,7 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The activator class controls the plug-in life cycle
+ * @since 3.0
  */
 public class Activator extends AbstractUIPlugin {
 
@@ -44,11 +45,13 @@ public class Activator extends AbstractUIPlugin {
 	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.widgets"; //$NON-NLS-1$
 
 
-	/** The Constant UML_VIS_ICONS_16x16. */
+	/** The Constant UML_VIS_ICONS_16x16. 
+	 * @since 3.0*/
 	public static final String UML_VIS_ICONS_16x16 = "icons/obj16/"; //$NON-NLS-1$
 
 
-	/** Default image. */
+	/** Default image. 
+	 * @since 3.0*/
 	public static final String DEFAULT_IMAGE = "icons/PapyrusLogo16x16.gif"; //$NON-NLS-1$
 
 	/**
@@ -133,6 +136,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @param key
 	 *            the key of the image
 	 * @return the Image
+	 * @since 3.0
 	 */
 	public static Image getImageFromKey(final String key) {
 		String image_id = key;
@@ -162,6 +166,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @param localPath
 	 *            the relative path
 	 * @return the path as {@link String}.
+	 * @since 3.0
 	 */
 	public static String getPath(final String plugin, final String localPath) {
 		return PLUGIN_PROTOCOL + plugin + localPath;
@@ -173,6 +178,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @param initialValue
 	 *            the initial value from which the bundle has to be retrieved
 	 * @return the bundle id
+	 * @since 3.0
 	 */
 	public static String retrieveBundleId(final String initialValue) {
 		String result = null;
@@ -216,6 +222,7 @@ public class Activator extends AbstractUIPlugin {
 	 * @param initialValue
 	 *            the initial value from which the lacal path has to be retrieved
 	 * @return the local path
+	 * @since 3.0
 	 */
 	public static String retrieveLocalPath(final String initialValue) {
 		String result = "";
@@ -381,41 +388,50 @@ public class Activator extends AbstractUIPlugin {
 	/** the default value for the use of live validation in filter. */
 	private static final Boolean DEFAULT_FILTER_LIVE_VALIDATION_VALUE = true; // $NON-NLS-1$
 
-	/** The max level to expand action preference. */
+	/** The max level to expand action preference. 
+	 * @since 3.0*/
 	public static final String PREF_MAX_LEVEL_TO_EXPAND = "maxLevelToExpand"; //$NON-NLS-1$
 
-	/** The default value of the expand action preference. */
+	/** The default value of the expand action preference. 
+	 * @since 3.0*/
 	public static final int DEFAULT_MAX_LEVEL_TO_EXPAND_VALUE = 15;
 
-	/** The preference for the replacement of stereotype delimiters. */
+	/** The preference for the replacement of stereotype delimiters. 
+	 * @since 3.0*/
 	public static final String PREF_FILTER_STEREOTYPE_REPLACED = "replaceStrereotypeDelimiter"; //$NON-NLS-1$
 
-	/** the default value for the replacement of stereotype delimiters. */
+	/** the default value for the replacement of stereotype delimiters. 
+	 * @since 3.0*/
 	public static final boolean DEFAULT_FILTER_STEREOTYPE_REPLACED_VALUE = true;
 
 	/**
 	 * The left stereotype delimiter
+	 * @since 3.0
 	 */
 	public static final String ST_LEFT = "\u00AB";//$NON-NLS-1$
 
 	/**
 	 * The right stereotype delimiter
+	 * @since 3.0
 	 */
 	public static final String ST_RIGHT = "\u00BB";//$NON-NLS-1$
 
 	/**
 	 * The right stereotype delimiter to be replaced in Text
+	 * @since 3.0
 	 */
 	public static final String ST_RIGHT_BEFORE = ">>";//$NON-NLS-1$
 
 	/**
 	 * The left stereotype delimiter to be replaced in fields
+	 * @since 3.0
 	 */
 	public static final String ST_LEFT_BEFORE = "<<";//$NON-NLS-1$
 
 
 	/**
 	 * Gets the preferences for the validation kind of filter field.
+	 * @since 3.0
 	 */
 	public static boolean isFilterValidateOnDelay() {
 		return ModelExplorerPreferences.getBoolean(PREF_FILTER_LIVE_VALIDATION, DEFAULT_FILTER_LIVE_VALIDATION_VALUE);
@@ -423,6 +439,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Gets the preferences for the validation delay.
+	 * @since 3.0
 	 */
 	public static int getValidationDelay() {
 		return ModelExplorerPreferences.getInt(PREF_FILTER_VALIDATION_DELAY, DEFAULT_VALIDATION_DELAY_VALUE);
@@ -430,6 +447,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Gets the preferences for the max level to expand value.
+	 * @since 3.0
 	 */
 	public static int getMaxLevelToExpandValue() {
 		return ModelExplorerPreferences.getInt(PREF_MAX_LEVEL_TO_EXPAND, DEFAULT_MAX_LEVEL_TO_EXPAND_VALUE);
@@ -437,6 +455,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/**
 	 * Gets the preferences for the stereotype delimiter replacement.
+	 * @since 3.0
 	 */
 	public static boolean isStereotypeDelimitersReplaced() {
 		return ModelExplorerPreferences.getBoolean(PREF_FILTER_STEREOTYPE_REPLACED, DEFAULT_FILTER_STEREOTYPE_REPLACED_VALUE);
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/IFireDoubleClick.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/IFireDoubleClick.java
index dbe626b4254..79d08e31f7c 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/IFireDoubleClick.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/IFireDoubleClick.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.DoubleClickEvent;
 
 /**
  * An interface to add the possibility to fire programmatically double click and element such as viewer.
+ * @since 3.0
  */
 public interface IFireDoubleClick {
 
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
index ca3a652b58e..797d4f1bc45 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/MultipleStringEditor.java
@@ -104,6 +104,7 @@ public class MultipleStringEditor<T extends StringSelector> extends MultipleValu
 	 *            Indicates if the values should be unique.
 	 * @param label
 	 *            The editor's label
+	 * @since 3.0
 	 */
 	public MultipleStringEditor(Composite parent, int style, T selector, boolean ordered, boolean unique, String label) {
 		super(parent, style, selector, ordered, unique, label);
@@ -121,6 +122,7 @@ public class MultipleStringEditor<T extends StringSelector> extends MultipleValu
 	 *            The List's style
 	 * @param selector
 	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.
+	 * @since 3.0
 	 */
 	public MultipleStringEditor(Composite parent, int style, T selector) {
 		super(parent, style, selector);
@@ -140,6 +142,7 @@ public class MultipleStringEditor<T extends StringSelector> extends MultipleValu
 	 *            The Element selector for the dialog's left-pane. Used to select values or enter new ones.
 	 * @param label
 	 *            The editor's label
+	 * @since 3.0
 	 */
 	public MultipleStringEditor(Composite parent, int style, T selector, String label) {
 		super(parent, style, selector, label);
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
index 6458857aaca..4725c78e9e9 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/messages/Messages.java
@@ -23,12 +23,24 @@ public class Messages extends NLS {
 	/** The Constant BUNDLE_NAME. */
 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.widgets.messages.messages"; //$NON-NLS-1$
 
+	/**
+	 * @since 3.0
+	 */
 	public static String AbstractFilteredContentProvider_CaseSensitiveLabel;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String AbstractFilteredContentProvider_CaseSensitiveTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String AbstractFilteredContentProvider_FilterFieldTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String IconValueEditor_WaitingOneIconButFound;
 
 	public static String BooleanInputValidator_NotABoolean;
@@ -140,18 +152,39 @@ public class Messages extends NLS {
 	/** the Enum radio_ no value */
 	public static String EnumRadio_NoValue;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FilteredContentProvider_CaseSensitiveLabel;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FilteredContentProvider_CaseSensitiveTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FilteredContentProvider_CollapseAllTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FilteredContentProvider_ExpandAllTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FlatFilteredContentProvider_sortButtonTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FlattenableFilteredContentProvider_flatButtonAsFlatTooltip;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String FlattenableFilteredContentProvider_flatButtonAsTreeTooltip;
 
 	public static String FlattenableRestrictedFilteredContentProvider_AllPossibleContentsMessage;
@@ -175,26 +208,59 @@ public class Messages extends NLS {
 
 	public static String StringFileSelector_BrowseWorkspace;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleIconExplorerDialog_Bundle;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleIconExplorerDialog_CantFindBundleIdMessage;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String StringWithClearEditor_ClearFilter;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleIconExplorerDialog_Message;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleIconExplorerDialog_Title;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleIconExplorerDialog_UnknownFileName;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleExplorerDialog_DialogMessage;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String BundleExplorerDialog_PlugInSelectionTitle;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String TreeReferenceValueEditor_NameColumnProperty;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String TreeReferenceValueEditor_NameColumnValue;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String TreeSelectorDialog_defaultTabLabel;
 
 	static {
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
index c4f226eb297..adb34280a1e 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/providers/AbstractTreeFilter.java
@@ -191,6 +191,9 @@ public abstract class AbstractTreeFilter extends ViewerFilter {
 		return result;
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public void clearCache() {
 		visibleElement.clear();
 		visibleParent.clear();
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PapyrusSelectionService.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PapyrusSelectionService.java
index b91af0d3dfe..10d562ff1ef 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PapyrusSelectionService.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/util/PapyrusSelectionService.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 
 /**
  * Selection Service for Papyrus widget. Usually for widget instantiate with xwt where we can't use SelectionService like MultipleValueEditor.
+ * @since 3.0
  */
 public class PapyrusSelectionService implements ISelectionChangedListener, ISelectionProvider {
 
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index 317844f08bf..2dffbe9cf45 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reex
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",

  org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
index 57eaaee3d2a..3794ae4e907 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/IViewTypeHelper.java
@@ -46,6 +46,7 @@ public interface IViewTypeHelper {
 	 * @param configuration
 	 *            A view configuration element
 	 * @return The associated prototype
+	 * @since 2.0
 	 */
 	ViewPrototype getPrototypeFor(PapyrusRepresentationKind configuration);
 
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
index 1558d2f64a3..b4f38600bab 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ModelRuleConstraintEngine.java
@@ -56,6 +56,9 @@ public class ModelRuleConstraintEngine extends DefaultConstraintEngine<ModelRule
 		fireConstraintsChanged();
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public boolean matchesRule(ModelRule rule, EObject element) {
 		Collection<EObject> selection = Collections.singletonList(element);
 		List<Constraint> constraints = getConstraintsFor(rule);
@@ -80,6 +83,7 @@ public class ModelRuleConstraintEngine extends DefaultConstraintEngine<ModelRule
 	 * @param rule
 	 *            the rule to check
 	 * @return the list of constraints for the specified rule or an empty list if no rule is registered for the rule
+	 * @since 2.0
 	 */
 	protected List<Constraint> getConstraintsFor(ModelRule rule) {
 		if (!modelRule2Constraints.containsKey(rule)) {
@@ -95,6 +99,7 @@ public class ModelRuleConstraintEngine extends DefaultConstraintEngine<ModelRule
 	 * @param rule
 	 *            the rule that contains the constraints
 	 * @return the list of constraints for the given rule or an empty list if no constraints were found for the given rule
+	 * @since 2.0
 	 */
 	protected List<Constraint> initializeConstraints(ModelRule rule) {
 		List<ConstraintDescriptor> descriptors = rule.getConstraints();
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
index 28b917a251d..74e2bab3b7c 100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java
@@ -71,6 +71,9 @@ public class PolicyChecker {
 	 */
 	private static final int RESULT_DENY = -1;
 
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(EObject object) {
 		if (object.eResource() != null)
 			return getFor(object.eResource());
@@ -78,6 +81,9 @@ public class PolicyChecker {
 			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
 	
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(Resource resource) {
 		if (resource.getResourceSet() != null)
 			return getFor(resource.getResourceSet());
@@ -85,6 +91,9 @@ public class PolicyChecker {
 			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(ResourceSet resourceSet) {
 		if (resourceSet instanceof ModelSet)
 			return getFor((ModelSet) resourceSet);
@@ -92,11 +101,17 @@ public class PolicyChecker {
 			return getFor(ArchitectureDomainManager.getInstance().getDefaultArchitectureContext());
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(ModelSet modelSet) {
 		Collection<MergedArchitectureViewpoint> viewpoints = new ArchitectureDescriptionUtils(modelSet).getArchitectureViewpoints();
 		return getFor(viewpoints);
 	}
 	
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(MergedArchitectureContext context) {
 		if (context == null) {
 			return new PolicyChecker(Collections.emptyList());
@@ -104,6 +119,9 @@ public class PolicyChecker {
 		return new PolicyChecker(context.getViewpoints());
 	}
 
+	/**
+	 * @since 2.0
+	 */
 	public static PolicyChecker getFor(Collection<MergedArchitectureViewpoint> viewpoints) {
 		return new PolicyChecker(viewpoints);
 	}
@@ -122,6 +140,7 @@ public class PolicyChecker {
 	 * Gets the viewpoint enforced by this object
 	 *
 	 * @return The enforced viewpoint
+	 * @since 2.0
 	 */
 	public Collection<MergedArchitectureViewpoint> getViewpoints() {
 		return viewpoints;
@@ -289,6 +308,7 @@ public class PolicyChecker {
 	 * @param config
 	 *            A view description element
 	 * @return <code>true</code> if the element is part of the current viewpoint
+	 * @since 2.0
 	 */
 	public boolean isInViewpoint(PapyrusRepresentationKind kind) {
 		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
@@ -372,6 +392,7 @@ public class PolicyChecker {
 	 * @param owner
 	 *            The view's owner
 	 * @return The owning rule
+	 * @since 2.0
 	 */
 	public OwningRule getOwningRuleFor(ViewPrototype prototype, EObject owner) {
 		Collection<EClass> stereotypes = profileHelper.getAppliedStereotypes(owner);
@@ -390,6 +411,7 @@ public class PolicyChecker {
 	 * @param root
 	 *            The root element
 	 * @return The matching view, or <code>null</code> if none was found
+	 * @since 2.0
 	 */
 	protected PapyrusRepresentationKind getRepresentationKindFrom(String implem, EObject owner, EObject root) {
 		for (MergedArchitectureViewpoint viewpoint : getViewpoints()) {
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
index 849c8032c97..e81fd6eac44 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ProfileUtils.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EPackage;
  * Helper class for the ProfileHelper extension point
  *
  * @author Laurent Wouters
+ * @since 2.0
  */
 public class ProfileUtils {
 	/**