[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
author: Florian Noyrit 2017-05-05 10:07:33 +0000
committer: Florian Noyrit 2017-05-09 08:14:26 +0000
commit: e547eb80614ac6baba8c4ba5b839bed631d39aac (patch)
tree: 621514227b75f6efdb43f1c0026ade4f4a3484c7 /plugins
parent: 85dd25671b246b9ee2db9eb87b76e5f754128041 (diff)
download: org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.tar.gz
org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.tar.xz
org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.zip
403 files changed, 4362 insertions, 3626 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/.project b/plugins/developer/org.eclipse.papyrus.dev.types/.project
index 69a8807b498..dfb6ffa2e60 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/.project
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/.project
@@ -1,63 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.dev.types</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>src_container</key>
-					<value>transforms/VisualID Migration</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.dev.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.dev.types</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.oomph.version.VersionBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>check.maven.pom</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>ignore.lower.bound.dependency.ranges</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.papyrus.releng.dev.release/release.xml</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.oomph.version.VersionNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.ui/.project b/plugins/developer/org.eclipse.papyrus.dev.ui/.project
index 358629e1d70..53463e897e4 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.ui/.project
+++ b/plugins/developer/org.eclipse.papyrus.dev.ui/.project
@@ -11,17 +11,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
index e13b9e0eaaf..ca3c23aa8e3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  com.ibm.icu;bundle-version="54.0.0"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
index 359afc46143..9d8dc92d73c 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.common.core</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
index 233a77a6baf..0fd0c7ca872 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
index df6c5e74623..6dff3110f5d 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.common.sdk.core</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
index 18ae834b6c6..aa513ac84c3 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.common.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.emf.facet.common.core;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
index 67ea5afe1b8..4624a6962c4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.core,
  org.eclipse.papyrus.emf.facet.custom.core.internal.query
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.core.internal.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
index 8e6c5638a63..b9ba35a2517 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.emf.facet.custom.core</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/src/org/eclipse/papyrus/emf/facet/custom/core/internal/CustomizationsDelegatingList.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/src/org/eclipse/papyrus/emf/facet/custom/core/internal/CustomizationsDelegatingList.java
index 9df3c12b6bc..96c8b060226 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/src/org/eclipse/papyrus/emf/facet/custom/core/internal/CustomizationsDelegatingList.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/src/org/eclipse/papyrus/emf/facet/custom/core/internal/CustomizationsDelegatingList.java
@@ -33,6 +33,9 @@ public class CustomizationsDelegatingList extends BasicEList<Customization> {
 		this.delegate = delegate;
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	protected void didAdd(int index, Customization newObject) {
 		// Insert at the corresponding location in the delegate
@@ -43,22 +46,34 @@ public class CustomizationsDelegatingList extends BasicEList<Customization> {
 		delegate.add(index, newObject);
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	protected void didSet(int index, Customization newObject, Customization oldObject) {
 		index = delegate.indexOf(oldObject);
 		delegate.set(index, newObject);
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	protected void didRemove(int index, Customization oldObject) {
 		delegate.remove(oldObject);
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	protected void didClear(int size, Object[] oldObjects) {
 		delegate.removeAll(Arrays.asList(oldObjects));
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	protected void didMove(int index, Customization movedObject, int oldIndex) {
 		// Move to the corresponding location in the delegate
@@ -80,6 +95,7 @@ public class CustomizationsDelegatingList extends BasicEList<Customization> {
 	 * @param facetSets
 	 *            the superset
 	 * @return the subset of customizations
+	 * @since 3.0
 	 */
 	protected static List<Customization> customizations(List<FacetSet> facetSets) {
 		return facetSets.stream()
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
index 0849e5a3dbc..8d98bea36fd 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
index 7a72ca866a3..2c4ef8b4eb5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.sdk.core,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.emf.facet.common.sdk.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.emf.facet.common.sdk.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
index f5514bcd4ed..37d40fd2f23 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.emf.facet.custom.ui,
  org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.dialog,
  org.eclipse.papyrus.emf.facet.custom.ui.internal.exported.exception,
  org.eclipse.papyrus.emf.facet.custom.ui.internal.query
-Require-Bundle: org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.emf.facet.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
index 5c19bfcdba6..0fe941e97e7 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[2.0.0,3.0.0)",
- 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.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
index 830548fffbc..13eb02c70c5 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.papyrus.emf.facet.util.emf.core,
  org.eclipse.papyrus.emf.facet.util.emf.core.serialization.model.serialization.impl;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.emf.facet.util.emf.catalog;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.emf.facet.common.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.emf.facet.common.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.emf.facet.util.pde.core;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
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 {
 	/**
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath
index 856d2dc45b4..0c22b5d7e6d 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF
index e190c8cdbfa..da009f80d40 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.papyrus.infra.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.emf.facet.custom.ui;bundle-version="[3.0.0,4.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.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
index e635829e3b4..31e0a7bea56 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.nattable.common;bundle-version="[3.0.0,4.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;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.nattable;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/Activator.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/Activator.java
index 26695d24008..009f29fda9a 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/Activator.java
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/Activator.java
@@ -34,6 +34,9 @@ public class Activator extends AbstractUIPlugin {
 	private static Activator plugin;
 
 	// The log for this plugin
+	/**
+	 * @since 3.0
+	 */
 	public static LogHelper log;
 
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AcceptEventActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AcceptEventActionEditHelperAdvice.java
index 2542c704004..e1e9681be1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AcceptEventActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AcceptEventActionEditHelperAdvice.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
+ * @since 3.0
  *
  */
 public class AcceptEventActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AddStructuralFeatureValueActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AddStructuralFeatureValueActionEditHelperAdvice.java
index 3197c00089c..45a2205e36a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AddStructuralFeatureValueActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/AddStructuralFeatureValueActionEditHelperAdvice.java
@@ -34,6 +34,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of AddStructuralFeatureValueAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class AddStructuralFeatureValueActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/BehaviorEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/BehaviorEditHelperAdvice.java
index 00b92348647..9e342cf30ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/BehaviorEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/BehaviorEditHelperAdvice.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of StartObjectBehaviorAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class BehaviorEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallEventEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallEventEditHelperAdvice.java
index 4b279495d14..e49a08cfbb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallEventEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CallEventEditHelperAdvice.java
@@ -38,6 +38,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  * 
  * Call pin derivation command on modification of a callEvent
+ * @since 3.0
  */
 public class CallEventEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateLinkActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateLinkActionEditHelperAdvice.java
index 4414bba1e71..7827cee3bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateLinkActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateLinkActionEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of CreateLinkAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class CreateLinkActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateObjectActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateObjectActionEditHelperAdvice.java
index 909b7b2bf6f..649e25d7a72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateObjectActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/CreateObjectActionEditHelperAdvice.java
@@ -29,6 +29,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of CreateObjectAction should be create and update automatically
+ * @since 3.0
  * 
  */
 public class CreateObjectActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/DestroyLinkActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/DestroyLinkActionEditHelperAdvice.java
index e3f82f6af4b..bbdadbd9504 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/DestroyLinkActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/DestroyLinkActionEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of DestroyLinkAction should be create and update automatically
+ * @since 3.0
  *  
  */
 public class DestroyLinkActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InputPinStartObjectBehaviorActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InputPinStartObjectBehaviorActionEditHelperAdvice.java
index e2aeeac09a5..7f7d0e5c0f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InputPinStartObjectBehaviorActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InputPinStartObjectBehaviorActionEditHelperAdvice.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * Edit helper advice for {@link StartObjectBehaviorAction}
+ * @since 3.0
  */
 public class InputPinStartObjectBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceSpecificationEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceSpecificationEditHelperAdvice.java
index 2ef345e737f..3478e7bb3e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceSpecificationEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceSpecificationEditHelperAdvice.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.ValueSpecificationAction;
 /**
  * 
  * Pin of ValueSpecificationAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class InstanceSpecificationEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceValueEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceValueEditHelperAdvice.java
index 85cafa5c7bb..0a4c6a81424 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceValueEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/InstanceValueEditHelperAdvice.java
@@ -35,6 +35,7 @@ import org.eclipse.uml2.uml.ValueSpecificationAction;
 /**
  * 
  * Pin of ValueSpecificationAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class InstanceValueEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndCreationDataEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndCreationDataEditHelperAdvice.java
index a676f907247..ea87de94942 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndCreationDataEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndCreationDataEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of CreateLinkAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class LinkEndCreationDataEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDataEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDataEditHelperAdvice.java
index 6120f38f87c..36a572d998d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDataEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDataEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of ReadLinkAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class LinkEndDataEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDestructionDataEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDestructionDataEditHelperAdvice.java
index bf5fe7608fe..d258f94b5ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDestructionDataEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/LinkEndDestructionDataEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of DestroyLinkAction should be create and update automatically
+ * @since 3.0
  * 
  */
 public class LinkEndDestructionDataEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/OperationEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/OperationEditHelperAdvice.java
index a846be7fd8a..703a7762ac0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/OperationEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/OperationEditHelperAdvice.java
@@ -39,6 +39,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  * 
  * Call pin derivation command on modification of an operation
+ * @since 3.0
  */
 public class OperationEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ParameterEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ParameterEditHelperAdvice.java
index 2a833b8e4f4..f6d52f292ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ParameterEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ParameterEditHelperAdvice.java
@@ -46,6 +46,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  * 
  * Call pin derivation command on modification of a parameter
+ * @since 3.0
  */
 public class ParameterEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/PropertyEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/PropertyEditHelperAdvice.java
index c1b8a2eefc1..d22809b3524 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/PropertyEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/PropertyEditHelperAdvice.java
@@ -50,6 +50,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  * 
  * Call pin derivation command on modification of a property
+ * @since 3.0
  */
 public class PropertyEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadLinkActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadLinkActionEditHelperAdvice.java
index 227bc0f8f0b..57b08397777 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadLinkActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadLinkActionEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of ReadLinkAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class ReadLinkActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadSelfActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadSelfActionEditHelperAdvice.java
index 1bf94a1a6da..e10e20d0bdf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadSelfActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadSelfActionEditHelperAdvice.java
@@ -27,6 +27,7 @@ import org.eclipse.uml2.uml.ReadSelfAction;
 /**
  * 
  * Pin of ReadSelfAction should be create and update automatically
+ * @since 3.0
  * 
  */
 public class ReadSelfActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadStructuralFeatureActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadStructuralFeatureActionEditHelperAdvice.java
index e5f36fa1f23..bcacd391087 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadStructuralFeatureActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ReadStructuralFeatureActionEditHelperAdvice.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of ReadStructuralFeatureAction should be create and update automatically
+ * @since 3.0
  * 
  */
 public class ReadStructuralFeatureActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEditHelperAdvice.java
index 6d9ca68df93..7f938ea771b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEditHelperAdvice.java
@@ -41,6 +41,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  *
  * Call pin derivation command on modification of a signal
+ * @since 3.0
  */
 public class SignalEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEventEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEventEditHelperAdvice.java
index 4a9f45e59c5..9cb3517fccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEventEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/SignalEventEditHelperAdvice.java
@@ -39,6 +39,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  *
  * Call pin derivation command on modification of a signalEvent
+ * @since 3.0
  */
 public class SignalEventEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartClassifierBehaviorActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartClassifierBehaviorActionEditHelperAdvice.java
index df03e45372a..bdd5fa0a8c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartClassifierBehaviorActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartClassifierBehaviorActionEditHelperAdvice.java
@@ -28,6 +28,7 @@ import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
 /**
  * 
  * Pin of StartClassifierBehaviorAction should be create and update automatically
+ * @since 3.0
  * 
  */
 public class StartClassifierBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartObjectBehaviorActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartObjectBehaviorActionEditHelperAdvice.java
index 3858f5aeec1..d2b9d4d0cbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartObjectBehaviorActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/StartObjectBehaviorActionEditHelperAdvice.java
@@ -29,6 +29,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 /**
  * 
  * Pins of StartObjectBehaviorAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class StartObjectBehaviorActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TestIdentityActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TestIdentityActionEditHelperAdvice.java
index da42fe13d70..6b2bf66627b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TestIdentityActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TestIdentityActionEditHelperAdvice.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.TestIdentityAction;
 /**
  * 
  * Pins of TestIdentityAction should be create automatically
+ * @since 3.0
  * 
  */
 public class TestIdentityActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TriggerEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TriggerEditHelperAdvice.java
index 8e9527d422c..0e557a82ae0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TriggerEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/TriggerEditHelperAdvice.java
@@ -38,6 +38,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
  *
  * Call pin derivation command on modification of a trigger
+ * @since 3.0
  */
 public class TriggerEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ValueSpecificationActionEditHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ValueSpecificationActionEditHelperAdvice.java
index 00570308b4c..f73f81be564 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ValueSpecificationActionEditHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/advices/ValueSpecificationActionEditHelperAdvice.java
@@ -35,6 +35,7 @@ import org.eclipse.uml2.uml.ValueSpecificationAction;
 /**
  * 
  * Pin of ValueSpecificationAction should be create and update automatically
+ * @since 3.0
  *
  */
 public class ValueSpecificationActionEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityPartitionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityPartitionNameEditPart.java
index bb93529d7ff..3a8f353d228 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityPartitionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/part/CustomActivityPartitionNameEditPart.java
@@ -16,6 +16,9 @@ import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityPartitionName
 
 
 
+/**
+ * @since 3.0
+ */
 public class CustomActivityPartitionNameEditPart extends ActivityPartitionNameEditPart {
 	/**
 	 * Constructor.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityPartitionLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityPartitionLabelEditPolicy.java
index 59d991d4b62..4efb6772857 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityPartitionLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/ActivityPartitionLabelEditPolicy.java
@@ -24,6 +24,9 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEd
 import org.eclipse.uml2.uml.ActivityPartition;
 import org.eclipse.uml2.uml.Element;
 
+/**
+ * @since 3.0
+ */
 public class ActivityPartitionLabelEditPolicy extends AbstractMaskManagedEditPolicy {
 
 	@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/ActivityAutomatedModelCompletionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/ActivityAutomatedModelCompletionPreferencePage.java
index c2ca69a19b2..871fe3f3641 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/ActivityAutomatedModelCompletionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/ActivityAutomatedModelCompletionPreferencePage.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.ValueSpecificationAction;
 /**
  * 
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
+ * @since 3.0
  * 
  */
 public class ActivityAutomatedModelCompletionPreferencePage extends AbstractAutomatedModelCompletionPreferencesPage {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/IAutomatedModelCompletionPreferencesConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/IAutomatedModelCompletionPreferencesConstants.java
index 9c88fbe1bea..96700b2601e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/IAutomatedModelCompletionPreferencesConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/utils/updater/preferences/IAutomatedModelCompletionPreferencesConstants.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences;
 /**
  * 
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
+ * @since 3.0
  * 
  */
 public interface IAutomatedModelCompletionPreferencesConstants {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityPartitionLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityPartitionLabelHelper.java
index 37cea71b521..47882066c2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityPartitionLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/helper/ActivityPartitionLabelHelper.java
@@ -27,6 +27,9 @@ import org.eclipse.uml2.uml.ActivityPartition;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;
 
+/**
+ * @since 3.0
+ */
 public class ActivityPartitionLabelHelper extends StereotypedElementLabelHelper {
 
 	public static final String SHOW_REPRESENT_NAME = "representsName"; //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java
index b4e68d60a2e..2c53e43f931 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Class Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class ActivityReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java
index 751629b38fe..9ae97b177e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/migration/ActivityReconciler_1_1_0.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Activity Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class ActivityReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/part/CustomMessages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/part/CustomMessages.java
index 0cf96cfebb2..97a5327ff73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/part/CustomMessages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/part/CustomMessages.java
@@ -192,7 +192,13 @@ public class CustomMessages extends NLS {
 	public static String BehaviorToCallBehaviorActionDropStrategy_Label;
 	public static String BehaviorToCallBehaviorActionDropStrategy_Description;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String AutomatedModelCompletionPreferencesInitializer_None;
-
+	
+	/**
+	 * @since 3.0
+	 */
 	public static String AutomatedModelCompletionPreferencesInitializer_PinSynchronization;
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java
index 1af2e79df30..6e0660e1c13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java
@@ -62,6 +62,7 @@ public class AssociationDiamonViewCreateCommand extends AbstractCustomCommand {
 	 *            the preference hint of the diagram
 	 * @param point
 	 *            the location of the future association node
+	 * @since 3.0
 	 */
 	public AssociationDiamonViewCreateCommand(TransactionalEditingDomain domain, View container, EditPartViewer viewer, PreferencesHint preferencesHint, Point point, SemanticAdapter semanticAdapter) {
 		super(domain, "AssociationDiamonViewCreateCommand", null); //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java
index f750cf84c04..a92200e3179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java
@@ -61,6 +61,7 @@ public class DependencyDiamonViewCreateCommand extends AbstractCustomCommand {
 	 *            the preference hint of the diagram
 	 * @param point
 	 *            the location of the future association node
+	 * @since 3.0
 	 */
 	public DependencyDiamonViewCreateCommand(TransactionalEditingDomain domain, View container, EditPartViewer viewer, PreferencesHint preferencesHint, Point point, SemanticAdapter semanticAdapter) {
 		super(domain, "AssociationClassViewCreateCommand", null); //$NON-NLS-1$
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java
index fc6abd74f2d..cde7c2db5d9 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
 
 /**
  * Custom variant. Provides elementType for @see AbstractConstraintEditPart
+ * @since 3.0
  */
 public class CustomConstraintEditPartCN extends ConstraintEditPartCN {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java
index acce3c9b979..74eb19c27e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java
@@ -1,38 +1,39 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.clazz.custom.figure.nodes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;
-
-/**
- * Figure for Composite representation of InformationItem.
- */
-public class InformationItemFigure extends RoundedCompartmentFigure {
-
-	/** Value of the textual tag added to the figure. */
-	private static String TAG_LABEL = "Information"; //$NON-NLS-1$
-
-	/** The List of Compartment */
-	private final static List<String> NO_COMPARTMENT = new ArrayList<String>();
-
-	/**
-	 * Creates a new InformationItemFigure.
-	 */
-	public InformationItemFigure() {
-		super(NO_COMPARTMENT, TAG_LABEL);
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.clazz.custom.figure.nodes;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure;
+
+/**
+ * Figure for Composite representation of InformationItem.
+ * @since 3.0
+ */
+public class InformationItemFigure extends RoundedCompartmentFigure {
+
+	/** Value of the textual tag added to the figure. */
+	private static String TAG_LABEL = "Information"; //$NON-NLS-1$
+
+	/** The List of Compartment */
+	private final static List<String> NO_COMPARTMENT = new ArrayList<String>();
+
+	/**
+	 * Creates a new InformationItemFigure.
+	 */
+	public InformationItemFigure() {
+		super(NO_COMPARTMENT, TAG_LABEL);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java
index bd0b03cdb00..97188185fbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.Element;
  * inner classes of the class
  * 
  * @author Shuai Li
+ * @since 3.0
  *
  */
 public class InnerClassHyperlinkContributor implements HyperlinkContributor {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java
index 43520093497..c78490b3348 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java
@@ -1,127 +1,128 @@
-/*****************************************************************************
- * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, 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:
- *   Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation
- *   Christian W. Damus - bug 485220
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.services.BadStateException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
-import org.eclipse.papyrus.infra.hyperlink.Activator;
-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
-import org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor;
-import org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
-
-/**
- * Returns a list of HyperLinkEditor objects referencing views directly owned by
- * the nested packages of the double-clicked package.
- * 
- * @author Shuai Li
- *
- */
-public class NestedPackageHyperlinkContributor implements HyperlinkContributor {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor#getHyperlinks(java.lang.Object)
-	 *
-	 * @param fromElement
-	 * @return
-	 */
-	@Override
-	public List<HyperLinkObject> getHyperlinks(Object fromElement) {
-		ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>();
-
-		if (fromElement instanceof org.eclipse.uml2.uml.Package) {
-			List<org.eclipse.uml2.uml.Package> nestedPackages = ((org.eclipse.uml2.uml.Package) fromElement).getNestedPackages();
-			List<Object> pages = new ArrayList<Object>();
-
-			for (org.eclipse.uml2.uml.Package nestedPackage : nestedPackages) {
-				ViewerSearchService viewerSearchService = null;
-				try {
-					viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
-				} catch (ServiceException e) {
-					if (e instanceof ServiceNotFoundException) {
-						viewerSearchService = new ViewerSearchService();
-						try {
-							viewerSearchService.startService();
-							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).add(ViewerSearchService.class, 1, viewerSearchService);
-						} catch (ServiceException e1) {
-							Activator.log.error(e1);
-						}
-					} else if (e instanceof BadStateException) {
-						try {
-							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).startRegistry();
-							viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
-						} catch (Exception e1) {
-							Activator.log.error(e1);
-						}
-					}
-				}
-
-				if (viewerSearchService != null) {
-					List<Object> viewerSearchResults = viewerSearchService.getViewersInCurrentModel(null, nestedPackage, true, false);
-					pages.addAll(viewerSearchResults);
-				}
-			}
-
-			for (Object page : pages) {
-
-				if (page instanceof Diagram
-						&& ((Diagram) page).getType().equals(ModelEditPart.MODEL_ID)) {
-					try {
-						// Page must not be active page
-						IPage activeSashPage = ServiceUtilsForEObject.getInstance().getService(ISashWindowsContainer.class, (org.eclipse.uml2.uml.Package) fromElement).getActiveSashWindowsPage();
-						Object activePage = null;
-
-						if (activeSashPage != null) {
-							Object pageId = activeSashPage.getRawModel();
-
-							if (pageId instanceof PageRef) {
-								Object emfPageId = ((PageRef) pageId).getEmfPageIdentifier();
-
-								if (emfPageId instanceof View) {
-									activePage = emfPageId;
-								}
-							}
-						}
-
-						if (activePage == null || !activePage.equals(page)) {
-							HyperLinkEditor hyperlink = new HyperLinkEditor();
-							hyperlink.setObject(page);
-							hyperlinks.add(hyperlink);
-						}
-					} catch (Exception e) {
-						Activator.log.error(e);
-					}
-				}
-
-
-			}
-		}
-
-		return hyperlinks;
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, 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:
+ *   Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.services.BadStateException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor;
+import org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+
+/**
+ * Returns a list of HyperLinkEditor objects referencing views directly owned by
+ * the nested packages of the double-clicked package.
+ * 
+ * @author Shuai Li
+ * @since 3.0
+ *
+ */
+public class NestedPackageHyperlinkContributor implements HyperlinkContributor {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor#getHyperlinks(java.lang.Object)
+	 *
+	 * @param fromElement
+	 * @return
+	 */
+	@Override
+	public List<HyperLinkObject> getHyperlinks(Object fromElement) {
+		ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>();
+
+		if (fromElement instanceof org.eclipse.uml2.uml.Package) {
+			List<org.eclipse.uml2.uml.Package> nestedPackages = ((org.eclipse.uml2.uml.Package) fromElement).getNestedPackages();
+			List<Object> pages = new ArrayList<Object>();
+
+			for (org.eclipse.uml2.uml.Package nestedPackage : nestedPackages) {
+				ViewerSearchService viewerSearchService = null;
+				try {
+					viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
+				} catch (ServiceException e) {
+					if (e instanceof ServiceNotFoundException) {
+						viewerSearchService = new ViewerSearchService();
+						try {
+							viewerSearchService.startService();
+							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).add(ViewerSearchService.class, 1, viewerSearchService);
+						} catch (ServiceException e1) {
+							Activator.log.error(e1);
+						}
+					} else if (e instanceof BadStateException) {
+						try {
+							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).startRegistry();
+							viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
+						} catch (Exception e1) {
+							Activator.log.error(e1);
+						}
+					}
+				}
+
+				if (viewerSearchService != null) {
+					List<Object> viewerSearchResults = viewerSearchService.getViewersInCurrentModel(null, nestedPackage, true, false);
+					pages.addAll(viewerSearchResults);
+				}
+			}
+
+			for (Object page : pages) {
+
+				if (page instanceof Diagram
+						&& ((Diagram) page).getType().equals(ModelEditPart.MODEL_ID)) {
+					try {
+						// Page must not be active page
+						IPage activeSashPage = ServiceUtilsForEObject.getInstance().getService(ISashWindowsContainer.class, (org.eclipse.uml2.uml.Package) fromElement).getActiveSashWindowsPage();
+						Object activePage = null;
+
+						if (activeSashPage != null) {
+							Object pageId = activeSashPage.getRawModel();
+
+							if (pageId instanceof PageRef) {
+								Object emfPageId = ((PageRef) pageId).getEmfPageIdentifier();
+
+								if (emfPageId instanceof View) {
+									activePage = emfPageId;
+								}
+							}
+						}
+
+						if (activePage == null || !activePage.equals(page)) {
+							HyperLinkEditor hyperlink = new HyperLinkEditor();
+							hyperlink.setObject(page);
+							hyperlinks.add(hyperlink);
+						}
+					} catch (Exception e) {
+						Activator.log.error(e);
+					}
+				}
+
+
+			}
+		}
+
+		return hyperlinks;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java
index f6bc7e4b782..e8585d747dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java
@@ -1,124 +1,125 @@
-/*****************************************************************************
- * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, 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:
- *   Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation
- *   Christian W. Damus - bug 485220
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.services.BadStateException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
-import org.eclipse.papyrus.infra.hyperlink.Activator;
-import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
-import org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor;
-import org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
-
-/**
- * Returns a list of HyperLinkEditor objects referencing views directly owned by
- * the nesting package of the double-clicked package.
- * 
- * @author Shuai Li
- *
- */
-public class NestingPackageHyperlinkContributor implements HyperlinkContributor {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor#getHyperlinks(java.lang.Object)
-	 *
-	 * @param fromElement
-	 * @return
-	 */
-	@Override
-	public List<HyperLinkObject> getHyperlinks(Object fromElement) {
-		ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>();
-
-		if (fromElement instanceof org.eclipse.uml2.uml.Package) {
-			org.eclipse.uml2.uml.Package nestingPackage = ((org.eclipse.uml2.uml.Package) fromElement).getNestingPackage();
-			List<Object> pages = new ArrayList<Object>();
-
-			if (nestingPackage != null) {
-				ViewerSearchService viewerSearchService = null;
-				try {
-					viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
-				} catch (ServiceException e) {
-					if (e instanceof ServiceNotFoundException) {
-						viewerSearchService = new ViewerSearchService();
-						try {
-							viewerSearchService.startService();
-							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).add(ViewerSearchService.class, 1, viewerSearchService);
-						} catch (ServiceException e1) {
-							Activator.log.error(e1);
-						}
-					} else if (e instanceof BadStateException) {
-						try {
-							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).startRegistry();
-							viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
-						} catch (Exception e1) {
-							Activator.log.error(e1);
-						}
-					}
-				}
-
-				if (viewerSearchService != null) {
-					List<Object> viewerSearchResults = viewerSearchService.getViewersInCurrentModel(null, nestingPackage, true, false);
-					pages.addAll(viewerSearchResults);
-				}
-			}
-
-			for (Object page : pages) {
-				if (page instanceof Diagram
-						&& ((Diagram) page).getType().equals(ModelEditPart.MODEL_ID)) {
-					try {
-						// Page must not be active page
-						IPage activeSashPage = ServiceUtilsForEObject.getInstance().getService(ISashWindowsContainer.class, (org.eclipse.uml2.uml.Package) fromElement).getActiveSashWindowsPage();
-						Object activePage = null;
-
-						if (activeSashPage != null) {
-							Object pageId = activeSashPage.getRawModel();
-
-							if (pageId instanceof PageRef) {
-								Object emfPageId = ((PageRef) pageId).getEmfPageIdentifier();
-
-								if (emfPageId instanceof View) {
-									activePage = emfPageId;
-								}
-							}
-						}
-
-						if (activePage == null || !activePage.equals(page)) {
-							HyperLinkEditor hyperlink = new HyperLinkEditor();
-							hyperlink.setObject(page);
-							hyperlinks.add(hyperlink);
-						}
-					} catch (Exception e) {
-						Activator.log.error(e);
-					}
-				}
-			}
-		}
-
-		return hyperlinks;
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, 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:
+ *   Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.services.BadStateException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.hyperlink.object.HyperLinkEditor;
+import org.eclipse.papyrus.infra.hyperlink.Activator;
+import org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject;
+import org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor;
+import org.eclipse.papyrus.infra.services.viewersearch.impl.ViewerSearchService;
+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
+
+/**
+ * Returns a list of HyperLinkEditor objects referencing views directly owned by
+ * the nesting package of the double-clicked package.
+ * 
+ * @author Shuai Li
+ * @since 3.0
+ *
+ */
+public class NestingPackageHyperlinkContributor implements HyperlinkContributor {
+
+	/**
+	 * @see org.eclipse.papyrus.infra.hyperlink.service.HyperlinkContributor#getHyperlinks(java.lang.Object)
+	 *
+	 * @param fromElement
+	 * @return
+	 */
+	@Override
+	public List<HyperLinkObject> getHyperlinks(Object fromElement) {
+		ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>();
+
+		if (fromElement instanceof org.eclipse.uml2.uml.Package) {
+			org.eclipse.uml2.uml.Package nestingPackage = ((org.eclipse.uml2.uml.Package) fromElement).getNestingPackage();
+			List<Object> pages = new ArrayList<Object>();
+
+			if (nestingPackage != null) {
+				ViewerSearchService viewerSearchService = null;
+				try {
+					viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
+				} catch (ServiceException e) {
+					if (e instanceof ServiceNotFoundException) {
+						viewerSearchService = new ViewerSearchService();
+						try {
+							viewerSearchService.startService();
+							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).add(ViewerSearchService.class, 1, viewerSearchService);
+						} catch (ServiceException e1) {
+							Activator.log.error(e1);
+						}
+					} else if (e instanceof BadStateException) {
+						try {
+							ServiceUtilsForEObject.getInstance().getServiceRegistry((EObject) fromElement).startRegistry();
+							viewerSearchService = ServiceUtilsForEObject.getInstance().getService(ViewerSearchService.class, (EObject) fromElement);
+						} catch (Exception e1) {
+							Activator.log.error(e1);
+						}
+					}
+				}
+
+				if (viewerSearchService != null) {
+					List<Object> viewerSearchResults = viewerSearchService.getViewersInCurrentModel(null, nestingPackage, true, false);
+					pages.addAll(viewerSearchResults);
+				}
+			}
+
+			for (Object page : pages) {
+				if (page instanceof Diagram
+						&& ((Diagram) page).getType().equals(ModelEditPart.MODEL_ID)) {
+					try {
+						// Page must not be active page
+						IPage activeSashPage = ServiceUtilsForEObject.getInstance().getService(ISashWindowsContainer.class, (org.eclipse.uml2.uml.Package) fromElement).getActiveSashWindowsPage();
+						Object activePage = null;
+
+						if (activeSashPage != null) {
+							Object pageId = activeSashPage.getRawModel();
+
+							if (pageId instanceof PageRef) {
+								Object emfPageId = ((PageRef) pageId).getEmfPageIdentifier();
+
+								if (emfPageId instanceof View) {
+									activePage = emfPageId;
+								}
+							}
+						}
+
+						if (activePage == null || !activePage.equals(page)) {
+							HyperLinkEditor hyperlink = new HyperLinkEditor();
+							hyperlink.setObject(page);
+							hyperlinks.add(hyperlink);
+						}
+					} catch (Exception e) {
+						Activator.log.error(e);
+					}
+				}
+			}
+		}
+
+		return hyperlinks;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java
index 55375cff2c0..0e78a301b8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure
 
 /**
  * The Class ContainmentCircleOnPackageLocator.
+ * @since 3.0
  */
 @Deprecated //Unused: PortPositionLocator used instead
 public class ContainmentCircleOnPackageLocator extends BorderItemLocator {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java
index 3bac8ed066e..10e0251429f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class ClassReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java
index c883e42f143..3707a99b97a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Class Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class ClassReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedCompartmentEditPart.java
index c8dbf691bfc..534066e80e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedCompartmentEditPart.java
@@ -71,7 +71,11 @@ public abstract class RoundedCompartmentEditPart extends NamedElementEditPart {
 	/** The Constant DEFAULT_SHADOW_WIDTH. */
 	private static final int DEFAULT_SHADOW_WIDTH = 4;
 
-	/** The namedStyle Listener */
+	/**
+	 * The namedStyle Listener
+	 * 
+	 * @since 3.0
+	 */
 	protected IChangeListener namedStyleListener = new IChangeListener() {
 
 		@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/ConstraintFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/ConstraintFigure.java
index ce9120da6db..d2932e5cf07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/ConstraintFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/ConstraintFigure.java
@@ -189,6 +189,7 @@ public class ConstraintFigure extends CornerBentFigure implements IPapyrusNodeNa
 	 * Checks if the separator is wanted.
 	 * 
 	 * @return true, if it is
+	 * @since 3.0
 	 */
 	public boolean isSeparated() {
 		return drawSeparator;
@@ -198,6 +199,7 @@ public class ConstraintFigure extends CornerBentFigure implements IPapyrusNodeNa
 	 * Set the separator option
 	 * 
 	 * @param isSeparated
+	 * @since 3.0
 	 */
 	public void setSeparated(boolean isSeparated) {
 		this.drawSeparator = isSeparated;
@@ -314,6 +316,7 @@ public class ConstraintFigure extends CornerBentFigure implements IPapyrusNodeNa
 	/**
 	 *
 	 * @return the container of the text flow
+	 * @since 3.0
 	 */
 	public WrappingLabel getPageFlow() {
 		return page;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
index 5dbd319ace4..4c088b01269 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
@@ -461,6 +461,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 	 *            the parent block flow which will contain the created block
 	 * @param styles
 	 *            stack of styles to be applied
+	 * @since 3.0
 	 */
 	protected void generateBlocksForSpanNode(final Node node, final BlockFlow parentFlow, final Stack<Styles> styles) {
 		NodeList childrenNodes = node.getChildNodes();
@@ -810,6 +811,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 	 *            the parent block flow which will contain the created block
 	 * @param styles
 	 *            the stack of styles
+	 * @since 3.0
 	 */
 	protected void generateBlocksFromStrikeThroughNode(final Node node, final BlockFlow parentFlow, final Stack<Styles> styles) {
 		NodeList childrenNodes = node.getChildNodes();
@@ -1008,6 +1010,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 
 	/**
 	 * Valid HTML tags enumeration
+	 * @since 3.0
 	 */
 	protected enum HTMLTags {
 
@@ -1017,7 +1020,13 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 		h5(""), // sub sub section heading //$NON-NLS-1$
 		strong(""), // bold character //$NON-NLS-1$
 		b(""), // bold character //$NON-NLS-1$
+		/**
+		 * @since 3.0
+		 */
 		em(""), // italic //$NON-NLS-1$
+		/**
+		 * @since 3.0
+		 */
 		s(""), // strike through //$NON-NLS-1$
 		u(""), // underline //$NON-NLS-1$
 		sub(""), // subscript //$NON-NLS-1$
@@ -1027,6 +1036,9 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 		p(""), // paragraph //$NON-NLS-1$
 		br(""), // new line //$NON-NLS-1$
 		font(""), // specific font //$NON-NLS-1$
+		/**
+		 * @since 3.0
+		 */
 		span(""); //$NON-NLS-1$
 
 		/** additional data for this enum */
@@ -1061,7 +1073,15 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 	 * Styles to apply to the text
 	 */
 	protected enum Styles {
-		strong, header3, header4, header5, underline, italic, code, subscript, supscript, quote, font(new HashMap<String, Object>()), strikeThrough, color;
+		strong, header3, header4, header5, underline, italic, code, subscript, supscript, quote, font(new HashMap<String, Object>()), 
+		/**
+		 * @since 3.0
+		 */
+		strikeThrough, 
+		/**
+		 * @since 3.0
+		 */
+		color;
 
 		/** additional data */
 		private Map<String, Object> data;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/InteractionRectangleFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/InteractionRectangleFigure.java
index 6e721c9be5a..5b964b69b02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/InteractionRectangleFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/InteractionRectangleFigure.java
@@ -40,11 +40,13 @@ public class InteractionRectangleFigure extends RoundedCompartmentFigure {
 	public InteractionRectangleFigure() {
 		this(null);
 	}
+
 	/**
 	 * Create a new Classifier figure with the given tag
 	 *
 	 * @param tagLabel
 	 *            a String that will be displayed at the top of the figure
+	 * @since 3.0
 	 */
 	public InteractionRectangleFigure(String tagLabel) {
 		super(COMPARTMENT, tagLabel);
@@ -54,6 +56,7 @@ public class InteractionRectangleFigure extends RoundedCompartmentFigure {
 	 * Get the attribute's compartment figure
 	 *
 	 * @return
+	 * @since 3.0
 	 */
 	public IFigure getCompartmentFigure() {
 		return getCompartment(INTERACTION_COMPARTMENT);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RoundedCompartmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RoundedCompartmentFigure.java
index 6a2d2dd5894..a7cb4ee5ee7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RoundedCompartmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RoundedCompartmentFigure.java
@@ -871,6 +871,7 @@ public class RoundedCompartmentFigure extends NodeNamedElementFigure implements
 	 * Gets the dimension of all labels together.
 	 *
 	 * @return the dimension. (-1,-1) if there is no label.
+	 * @since 3.0
 	 */
 	protected Dimension getLabelsDimension() {
 		final Dimension labelDimension = new Dimension(-1, -1);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java
index 72ed059ff4f..9e5f32adc4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/PaletteUtil.java
@@ -397,6 +397,7 @@ public class PaletteUtil {
 	 * @param papyrusProviderDesc
 	 *            the current provider descriptor to test
 	 * @return <code>true</code> if all required profile are present
+	 * @since 3.0
 	 */
 	public static boolean areRequiredProfileApplied(IEditorPart part, PapyrusPaletteService.ProviderDescriptor papyrusProviderDesc) {
 		if (!(part instanceof DiagramEditorWithFlyOutPalette)) {
@@ -453,6 +454,7 @@ public class PaletteUtil {
 	 * @param provider
 	 *            The profile-dependent palette provider
 	 * @return <code>true</code> if all required profile are present
+	 * @since 3.0
 	 */
 	public static boolean areRequiredProfileApplied(Diagram diagram, IProfileDependantPaletteProvider provider) {
 		EObject element = diagram.getElement();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/preferences/AutomatedModelCompletionPreferenceDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/preferences/AutomatedModelCompletionPreferenceDescriptor.java
index 3fec04ef183..803e878c119 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/preferences/AutomatedModelCompletionPreferenceDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/preferences/AutomatedModelCompletionPreferenceDescriptor.java
@@ -21,6 +21,7 @@ import org.eclipse.uml2.uml.Element;
 /**
  * 
  * Automated pin derivation for AcceptEventAction and AcceptCallAction
+ * @since 3.0
  *
  */
 public class AutomatedModelCompletionPreferenceDescriptor {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomDiagramWithPrintGlobalActionHandlerProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomDiagramWithPrintGlobalActionHandlerProvider.java
index 58e58737822..7473f71fa73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomDiagramWithPrintGlobalActionHandlerProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomDiagramWithPrintGlobalActionHandlerProvider.java
@@ -32,6 +32,7 @@ import org.eclipse.ui.IWorkbenchPart;
  * when queried for global action handler.
  *
  * Customization of {@link org.eclipse.gmf.runtime.diagram.ui.printing.providers.DiagramWithPrintGlobalActionHandlerProvider}.
+ * @since 3.0
  *
  */
 public final class CustomDiagramWithPrintGlobalActionHandlerProvider extends AbstractGlobalActionHandlerProvider {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomPrintActionHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomPrintActionHelper.java
index 2de5be2d14e..67b94f662dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomPrintActionHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/CustomPrintActionHelper.java
@@ -31,6 +31,7 @@ import org.eclipse.ui.IEditorPart;
  * Provides basic printing functionality. This does a print from a default print
  * dialog.
  * Customization of <code>DefaultPrintActionHelper</code>
+ * @since 3.0
  *
  */
 public class CustomPrintActionHelper {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramWithPrintGlobalActionHandlerExtended.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramWithPrintGlobalActionHandlerExtended.java
index c9389d89ce4..3ec4c0afa8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramWithPrintGlobalActionHandlerExtended.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramWithPrintGlobalActionHandlerExtended.java
@@ -30,6 +30,7 @@ import org.eclipse.ui.IWorkbenchPart;
 /**
  * Class that implements the <code>IGlobalActionHandler</code>
  * interface and provides a command for <code>GlobalActionId.PRINT</code>.
+ * @since 3.0
  */
 public class DiagramWithPrintGlobalActionHandlerExtended extends DiagramWithPrintGlobalActionHandler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java
index 6fd156c4d51..c7ca548a524 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/migration/StereotypeDisplayDiagramReconciler_1_2_0.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.uml.diagram.common.stereotype.migration.commands.Ster
 import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
 
 /**
+ * @since 3.0
  *
  */
 public class StereotypeDisplayDiagramReconciler_1_2_0 extends DiagramReconciler {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/strategy/paste/InternationalizationPasteStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/strategy/paste/InternationalizationPasteStrategy.java
index 2acb0edaac7..5bedea8d7bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/strategy/paste/InternationalizationPasteStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/strategy/paste/InternationalizationPasteStrategy.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.internationalization.utils.utils.LabelInternati
 
 /**
  * Offer a strategy for the internationalization of pasted objects.
+ * @since 3.0
  */
 public class InternationalizationPasteStrategy extends AbstractPasteStrategy implements IPasteStrategy {
 	
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/AssociationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/AssociationUtil.java
index 806d9e936b1..b24d28b257b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/AssociationUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/AssociationUtil.java
@@ -91,6 +91,7 @@ public class AssociationUtil {
 	 * @param association
 	 *            The Association.
 	 * @return The first memberEnd.
+	 * @since 3.0
 	 */
 	public static Property getInitialTargetFirstEnd(final Association association) {
 		Property property = null;
@@ -107,6 +108,7 @@ public class AssociationUtil {
 	 * @param association
 	 *            The Association.
 	 * @return The second memberEnd
+	 * @since 3.0
 	 */
 	public static Property getInitialSourceSecondEnd(final Association association) {
 		Property property = null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineSemanticChildrenStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineSemanticChildrenStrategy.java
index cc793ab9910..2a631945613 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineSemanticChildrenStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineSemanticChildrenStrategy.java
@@ -1,135 +1,136 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus 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:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.communication.custom.canonical;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.canonical.DefaultUMLSemanticChildrenStrategy;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Lifeline;
-import org.eclipse.uml2.uml.Message;
-import org.eclipse.uml2.uml.MessageEnd;
-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
-import org.eclipse.uml2.uml.OccurrenceSpecification;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-/**
- * Custom semantic-children strategy for lifelines in communication diagrams.
- */
-public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildrenStrategy {
-
-	public LifelineSemanticChildrenStrategy() {
-		super();
-	}
-
-	@Override
-	public List<? extends EObject> getCanonicalSemanticConnections(EObject semanticFromEditPart, View viewFromEditPart) {
-		// We only have messages connected to lifelines in communication diagrams
-		List<? extends EObject> result = null;
-
-		Lifeline lifeline = (semanticFromEditPart instanceof Lifeline) ? (Lifeline) semanticFromEditPart : null;
-		if (lifeline != null) {
-			List<Element> messages = new ArrayList<Element>();
-			result = messages;
-
-			for (MessageEnd next : getMessageEnds(lifeline)) {
-				if (next.getMessage() != null) {
-					messages.add(next.getMessage());
-				}
-			}
-		}
-
-		return result;
-	}
-
-	Iterable<MessageEnd> getMessageEnds(Lifeline lifeline) {
-		return Iterables.filter(lifeline.getCoveredBys(), MessageEnd.class);
-	}
-
-	@Override
-	public Collection<? extends EObject> getCanonicalDependents(EObject semanticFromEditPart, View viewFromEditPart) {
-		List<? extends EObject> result = null;
-
-		Lifeline lifeline = (semanticFromEditPart instanceof Lifeline) ? (Lifeline) semanticFromEditPart : null;
-		if (lifeline != null) {
-			result = Lists.newArrayList(getMessageEnds(lifeline));
-		}
-
-		return result;
-	}
-
-	@Override
-	public Object getSource(EObject connectionElement) {
-		Object result;
-
-		if (connectionElement instanceof Message) {
-			MessageEnd end = ((Message) connectionElement).getSendEvent();
-			result = end;
-
-			// But, in this diagram, messages connect lifelines, not message-ends
-			Lifeline covered = getCovered(end);
-			if (covered != null) {
-				result = covered;
-			}
-		} else {
-			result = super.getSource(connectionElement);
-		}
-
-		return result;
-	}
-
-	/**
-	 * If a message end is a message occurrence specification (not a gate), get the lifeline
-	 * that it covers.
-	 * 
-	 * @param messageEnd
-	 *            a message end
-	 * @return its covered lifeline, if any
-	 */
-	protected Lifeline getCovered(MessageEnd messageEnd) {
-		Lifeline result = null;
-
-		if (messageEnd instanceof OccurrenceSpecification) {
-			result = ((MessageOccurrenceSpecification) messageEnd).getCovered();
-		}
-
-		return result;
-	}
-
-	@Override
-	public Object getTarget(EObject connectionElement) {
-		Object result;
-
-		if (connectionElement instanceof Message) {
-			MessageEnd end = ((Message) connectionElement).getReceiveEvent();
-			result = end;
-
-			// But, in this diagram, messages connect lifelines, not message-ends
-			Lifeline covered = getCovered(end);
-			if (covered != null) {
-				result = covered;
-			}
-		} else {
-			result = super.getTarget(connectionElement);
-		}
-
-		return result;
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2015 Christian W. Damus 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:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.communication.custom.canonical;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.canonical.DefaultUMLSemanticChildrenStrategy;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.Message;
+import org.eclipse.uml2.uml.MessageEnd;
+import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
+import org.eclipse.uml2.uml.OccurrenceSpecification;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
+/**
+ * Custom semantic-children strategy for lifelines in communication diagrams.
+ * @since 3.0
+ */
+public class LifelineSemanticChildrenStrategy extends DefaultUMLSemanticChildrenStrategy {
+
+	public LifelineSemanticChildrenStrategy() {
+		super();
+	}
+
+	@Override
+	public List<? extends EObject> getCanonicalSemanticConnections(EObject semanticFromEditPart, View viewFromEditPart) {
+		// We only have messages connected to lifelines in communication diagrams
+		List<? extends EObject> result = null;
+
+		Lifeline lifeline = (semanticFromEditPart instanceof Lifeline) ? (Lifeline) semanticFromEditPart : null;
+		if (lifeline != null) {
+			List<Element> messages = new ArrayList<Element>();
+			result = messages;
+
+			for (MessageEnd next : getMessageEnds(lifeline)) {
+				if (next.getMessage() != null) {
+					messages.add(next.getMessage());
+				}
+			}
+		}
+
+		return result;
+	}
+
+	Iterable<MessageEnd> getMessageEnds(Lifeline lifeline) {
+		return Iterables.filter(lifeline.getCoveredBys(), MessageEnd.class);
+	}
+
+	@Override
+	public Collection<? extends EObject> getCanonicalDependents(EObject semanticFromEditPart, View viewFromEditPart) {
+		List<? extends EObject> result = null;
+
+		Lifeline lifeline = (semanticFromEditPart instanceof Lifeline) ? (Lifeline) semanticFromEditPart : null;
+		if (lifeline != null) {
+			result = Lists.newArrayList(getMessageEnds(lifeline));
+		}
+
+		return result;
+	}
+
+	@Override
+	public Object getSource(EObject connectionElement) {
+		Object result;
+
+		if (connectionElement instanceof Message) {
+			MessageEnd end = ((Message) connectionElement).getSendEvent();
+			result = end;
+
+			// But, in this diagram, messages connect lifelines, not message-ends
+			Lifeline covered = getCovered(end);
+			if (covered != null) {
+				result = covered;
+			}
+		} else {
+			result = super.getSource(connectionElement);
+		}
+
+		return result;
+	}
+
+	/**
+	 * If a message end is a message occurrence specification (not a gate), get the lifeline
+	 * that it covers.
+	 * 
+	 * @param messageEnd
+	 *            a message end
+	 * @return its covered lifeline, if any
+	 */
+	protected Lifeline getCovered(MessageEnd messageEnd) {
+		Lifeline result = null;
+
+		if (messageEnd instanceof OccurrenceSpecification) {
+			result = ((MessageOccurrenceSpecification) messageEnd).getCovered();
+		}
+
+		return result;
+	}
+
+	@Override
+	public Object getTarget(EObject connectionElement) {
+		Object result;
+
+		if (connectionElement instanceof Message) {
+			MessageEnd end = ((Message) connectionElement).getReceiveEvent();
+			result = end;
+
+			// But, in this diagram, messages connect lifelines, not message-ends
+			Lifeline covered = getCovered(end);
+			if (covered != null) {
+				result = covered;
+			}
+		} else {
+			result = super.getTarget(connectionElement);
+		}
+
+		return result;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineVisualChildrenStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineVisualChildrenStrategy.java
index d07de91c549..92ee17716e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineVisualChildrenStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/canonical/LifelineVisualChildrenStrategy.java
@@ -1,77 +1,78 @@
-/*****************************************************************************
- * Copyright (c) 2015 Christian W. Damus 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:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.communication.custom.canonical;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.IVisualChildrenStrategy;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
-import org.eclipse.uml2.uml.Message;
-
-import com.google.common.collect.Lists;
-
-/**
- * Custom visual-children strategy for lifelines in communication diagrams.
- */
-public class LifelineVisualChildrenStrategy implements IVisualChildrenStrategy {
-
-	public LifelineVisualChildrenStrategy() {
-		super();
-	}
-
-	public List<? extends Edge> getCanonicalChildren(EditPart editPart, View view) {
-		return null;
-	}
-
-	public List<? extends View> getCanonicalEdges(EditPart editPart, View view) {
-		List<View> result = null;
-
-		if (editPart instanceof LifelineEditPartCN) {
-			// In the communication diagram, edges are just communication paths.
-			// It is labels on these edges that represent the messages sent
-			// and received by lifelines
-			result = Lists.newArrayList();
-
-			@SuppressWarnings("unchecked")
-			List<? extends Edge> sourceEdges = view.getSourceEdges();
-			for (Edge next : sourceEdges) {
-				collectMessages(next, result);
-			}
-
-			@SuppressWarnings("unchecked")
-			List<? extends Edge> targetEdges = view.getTargetEdges();
-			for (Edge next : targetEdges) {
-				// Don't process self-edges twice
-				if (next.getSource() != view) {
-					collectMessages(next, result);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private static void collectMessages(Edge edge, List<? super View> result) {
-		@SuppressWarnings("unchecked")
-		List<? extends View> labels = edge.getChildren();
-		for (View next : labels) {
-			if (next.getElement() instanceof Message) {
-				result.add(next);
-			}
-		}
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2015 Christian W. Damus 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:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.communication.custom.canonical;
+
+import java.util.List;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.canonical.strategy.IVisualChildrenStrategy;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
+import org.eclipse.uml2.uml.Message;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Custom visual-children strategy for lifelines in communication diagrams.
+ * @since 3.0
+ */
+public class LifelineVisualChildrenStrategy implements IVisualChildrenStrategy {
+
+	public LifelineVisualChildrenStrategy() {
+		super();
+	}
+
+	public List<? extends Edge> getCanonicalChildren(EditPart editPart, View view) {
+		return null;
+	}
+
+	public List<? extends View> getCanonicalEdges(EditPart editPart, View view) {
+		List<View> result = null;
+
+		if (editPart instanceof LifelineEditPartCN) {
+			// In the communication diagram, edges are just communication paths.
+			// It is labels on these edges that represent the messages sent
+			// and received by lifelines
+			result = Lists.newArrayList();
+
+			@SuppressWarnings("unchecked")
+			List<? extends Edge> sourceEdges = view.getSourceEdges();
+			for (Edge next : sourceEdges) {
+				collectMessages(next, result);
+			}
+
+			@SuppressWarnings("unchecked")
+			List<? extends Edge> targetEdges = view.getTargetEdges();
+			for (Edge next : targetEdges) {
+				// Don't process self-edges twice
+				if (next.getSource() != view) {
+					collectMessages(next, result);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private static void collectMessages(Edge edge, List<? super View> result) {
+		@SuppressWarnings("unchecked")
+		List<? extends View> labels = edge.getChildren();
+		for (View next : labels) {
+			if (next.getElement() instanceof Message) {
+				result.add(next);
+			}
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
index 82a379e0672..2e28aa97f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
@@ -1,58 +1,59 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Saadia Dhouib saadia.dhouib@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.communication.custom.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The Class Messages.
- */
-public class Messages extends NLS {
-
-	/** The Constant BUNDLE_NAME. */
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.communication.custom.messages.messages"; //$NON-NLS-1$
-
-	/**
-	 *
-	 */
-	public static String CommandHelper_PropertySelection;
-
-	/**
-	 *
-	 */
-	public static String CommandHelper_SelectProperty;
-
-	/**
-	 *
-	 */
-	public static String CommandHelper_SelectSignature;
-
-	/**
-	 *
-	 */
-	public static String CommandHelper_signatureslection;
-
-	/** The Message parser. */
-	public static String MessageParser_undefined;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	/**
-	 * Instantiates a new messages.
-	 */
-	private Messages() {
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Saadia Dhouib saadia.dhouib@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.communication.custom.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * The Class Messages.
+ * @since 3.0
+ */
+public class Messages extends NLS {
+
+	/** The Constant BUNDLE_NAME. */
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.communication.custom.messages.messages"; //$NON-NLS-1$
+
+	/**
+	 *
+	 */
+	public static String CommandHelper_PropertySelection;
+
+	/**
+	 *
+	 */
+	public static String CommandHelper_SelectProperty;
+
+	/**
+	 *
+	 */
+	public static String CommandHelper_SelectSignature;
+
+	/**
+	 *
+	 */
+	public static String CommandHelper_signatureslection;
+
+	/** The Message parser. */
+	public static String MessageParser_undefined;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	/**
+	 * Instantiates a new messages.
+	 */
+	private Messages() {
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java
index 228d30ae7c9..a909fcf5e84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class CommunicationReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java
index ab9706e9c7d..8e1997864ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_1_0.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Communication Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class CommunicationReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_2_0.java
index 3e2394b8b21..3b8622284f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/migration/CommunicationReconciler_1_2_0.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Class Diagram Reconciler from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class CommunicationReconciler_1_2_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parts/InteractionCompartmentDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parts/InteractionCompartmentDiagramUpdater.java
index ccc0dad4b0d..34c18bb868b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parts/InteractionCompartmentDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parts/InteractionCompartmentDiagramUpdater.java
@@ -1,140 +1,143 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * 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.uml.diagram.communication.custom.parts;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.CommentEditPartCN;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ConstraintEditPartCN;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationEditPartCN;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
-import org.eclipse.papyrus.uml.diagram.communication.edit.parts.TimeObservationEditPartCN;
-import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.communication.part.UMLNodeDescriptor;
-import org.eclipse.papyrus.uml.diagram.communication.part.UMLVisualIDRegistry;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.Lifeline;
-import org.eclipse.uml2.uml.PackageableElement;
-
-public class InteractionCompartmentDiagramUpdater implements ICustomDiagramUpdater<UMLNodeDescriptor> {
-
-	/**
-	 * <pre>
-	 * The original generated method of {@link UMLDiagramUpdater} class is kept commented below.
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	public List<UMLNodeDescriptor> getSemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interaction modelElement = (Interaction) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getLifelines().iterator(); it.hasNext();) {
-			Lifeline childElement = (Lifeline) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (LifelineEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		// Added ".getNearestPackage()"
-		for (Iterator<?> it = modelElement.getNearestPackage().getPackagedElements().iterator(); it.hasNext();) {
-			PackageableElement childElement = (PackageableElement) it.next();
-			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (TimeObservationEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (DurationObservationEditPartCN.VISUAL_ID.equals(visualID)) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-		// ----------------Original code-----------------
-		//
-		// if(false == view.eContainer() instanceof View) {
-		// return Collections.emptyList();
-		// }
-		// View containerView = (View)view.eContainer();
-		// if(!containerView.isSetElement()) {
-		// return Collections.emptyList();
-		// }
-		// Interaction modelElement = (Interaction)containerView.getElement();
-		// LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		// for(Iterator<?> it = modelElement.getLifelines().iterator(); it.hasNext();) {
-		// Lifeline childElement = (Lifeline)it.next();
-		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-		// if(visualID == LifelineEditPartCN.VISUAL_ID) {
-		// result.add(new UMLNodeDescriptor(childElement, visualID));
-		// continue;
-		// }
-		// }
-		// for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
-		// Comment childElement = (Comment)it.next();
-		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-		// if(visualID == CommentEditPartCN.VISUAL_ID) {
-		// result.add(new UMLNodeDescriptor(childElement, visualID));
-		// continue;
-		// }
-		// }
-		// for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
-		// Constraint childElement = (Constraint)it.next();
-		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-		// if(visualID == ConstraintEditPartCN.VISUAL_ID) {
-		// result.add(new UMLNodeDescriptor(childElement, visualID));
-		// continue;
-		// }
-		// }
-		// for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {
-		// PackageableElement childElement = (PackageableElement)it.next();
-		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-		// if(visualID == TimeObservationEditPartCN.VISUAL_ID) {
-		// result.add(new UMLNodeDescriptor(childElement, visualID));
-		// continue;
-		// }
-		// if(visualID == DurationObservationEditPartCN.VISUAL_ID) {
-		// result.add(new UMLNodeDescriptor(childElement, visualID));
-		// continue;
-		// }
-		// }
-		// return result;
-	}
-}
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * 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.uml.diagram.communication.custom.parts;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.CommentEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ConstraintEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.edit.parts.TimeObservationEditPartCN;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdater;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLNodeDescriptor;
+import org.eclipse.papyrus.uml.diagram.communication.part.UMLVisualIDRegistry;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Interaction;
+import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.PackageableElement;
+
+/**
+ * @since 3.0
+ */
+public class InteractionCompartmentDiagramUpdater implements ICustomDiagramUpdater<UMLNodeDescriptor> {
+
+	/**
+	 * <pre>
+	 * The original generated method of {@link UMLDiagramUpdater} class is kept commented below.
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	public List<UMLNodeDescriptor> getSemanticChildren(View view) {
+		if (false == view.eContainer() instanceof View) {
+			return Collections.emptyList();
+		}
+		View containerView = (View) view.eContainer();
+		if (!containerView.isSetElement()) {
+			return Collections.emptyList();
+		}
+		Interaction modelElement = (Interaction) containerView.getElement();
+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
+		for (Iterator<?> it = modelElement.getLifelines().iterator(); it.hasNext();) {
+			Lifeline childElement = (Lifeline) it.next();
+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if (LifelineEditPartCN.VISUAL_ID.equals(visualID)) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
+		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
+			Comment childElement = (Comment) it.next();
+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if (CommentEditPartCN.VISUAL_ID.equals(visualID)) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
+		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
+			Constraint childElement = (Constraint) it.next();
+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if (ConstraintEditPartCN.VISUAL_ID.equals(visualID)) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
+		// Added ".getNearestPackage()"
+		for (Iterator<?> it = modelElement.getNearestPackage().getPackagedElements().iterator(); it.hasNext();) {
+			PackageableElement childElement = (PackageableElement) it.next();
+			String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+			if (TimeObservationEditPartCN.VISUAL_ID.equals(visualID)) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+			if (DurationObservationEditPartCN.VISUAL_ID.equals(visualID)) {
+				result.add(new UMLNodeDescriptor(childElement, visualID));
+				continue;
+			}
+		}
+		return result;
+		// ----------------Original code-----------------
+		//
+		// if(false == view.eContainer() instanceof View) {
+		// return Collections.emptyList();
+		// }
+		// View containerView = (View)view.eContainer();
+		// if(!containerView.isSetElement()) {
+		// return Collections.emptyList();
+		// }
+		// Interaction modelElement = (Interaction)containerView.getElement();
+		// LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
+		// for(Iterator<?> it = modelElement.getLifelines().iterator(); it.hasNext();) {
+		// Lifeline childElement = (Lifeline)it.next();
+		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+		// if(visualID == LifelineEditPartCN.VISUAL_ID) {
+		// result.add(new UMLNodeDescriptor(childElement, visualID));
+		// continue;
+		// }
+		// }
+		// for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {
+		// Comment childElement = (Comment)it.next();
+		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+		// if(visualID == CommentEditPartCN.VISUAL_ID) {
+		// result.add(new UMLNodeDescriptor(childElement, visualID));
+		// continue;
+		// }
+		// }
+		// for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {
+		// Constraint childElement = (Constraint)it.next();
+		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+		// if(visualID == ConstraintEditPartCN.VISUAL_ID) {
+		// result.add(new UMLNodeDescriptor(childElement, visualID));
+		// continue;
+		// }
+		// }
+		// for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {
+		// PackageableElement childElement = (PackageableElement)it.next();
+		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
+		// if(visualID == TimeObservationEditPartCN.VISUAL_ID) {
+		// result.add(new UMLNodeDescriptor(childElement, visualID));
+		// continue;
+		// }
+		// if(visualID == DurationObservationEditPartCN.VISUAL_ID) {
+		// result.add(new UMLNodeDescriptor(childElement, visualID));
+		// continue;
+		// }
+		// }
+		// return result;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ComponentManageInterfacesHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ComponentManageInterfacesHandler.java
index 185920eb7b3..9f4fd4d1018 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ComponentManageInterfacesHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ComponentManageInterfacesHandler.java
@@ -1,44 +1,45 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *	Gabriel Pascual (ALL4TEc) gabriel.pascual@all4tec.net - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.actions;
-
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler;
-import org.eclipse.papyrus.uml.diagram.common.dialogs.IPortInterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.component.custom.ui.ComponentInterfaceManagerDialog;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Port;
-
-/**
- * This handler provides the action to manage the provided and required {@link Interface} for a {@link Port}.
- */
-public class ComponentManageInterfacesHandler extends ManagePortInterfacesHandler {
-
-	public ComponentManageInterfacesHandler() {
-		super();
-	}
-
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler#getInterfaceManagerDialog(org.eclipse.uml2.uml.Port)
-	 *
-	 * @param port
-	 * @return
-	 */
-	@Override
-	public IPortInterfaceManagerDialog getInterfaceManagerDialog(Port port) {
-		return new ComponentInterfaceManagerDialog(DisplayUtils.getDefaultShell(), (PortEditPart) getPortEditPart());
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *	Gabriel Pascual (ALL4TEc) gabriel.pascual@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.actions;
+
+import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
+import org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler;
+import org.eclipse.papyrus.uml.diagram.common.dialogs.IPortInterfaceManagerDialog;
+import org.eclipse.papyrus.uml.diagram.component.custom.ui.ComponentInterfaceManagerDialog;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Port;
+
+/**
+ * This handler provides the action to manage the provided and required {@link Interface} for a {@link Port}.
+ * @since 3.0
+ */
+public class ComponentManageInterfacesHandler extends ManagePortInterfacesHandler {
+
+	public ComponentManageInterfacesHandler() {
+		super();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.common.actions.handlers.ManagePortInterfacesHandler#getInterfaceManagerDialog(org.eclipse.uml2.uml.Port)
+	 *
+	 * @param port
+	 * @return
+	 */
+	@Override
+	public IPortInterfaceManagerDialog getInterfaceManagerDialog(Port port) {
+		return new ComponentInterfaceManagerDialog(DisplayUtils.getDefaultShell(), (PortEditPart) getPortEditPart());
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
index 48700ee74eb..dbeb3e8e21f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsAction.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.component.custom.messages.Messages;
 
 /**
  * The Class ShowHideRelatedContentsAction.
+ * @since 3.0
  */
 public class ShowHideRelatedContentsAction extends ShowHideContentsAction {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
index dcf9a25fe9d..8fe0dfbcaa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/actions/ShowHideRelatedContentsHandler.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedConten
 
 /**
  * Handler for the {@link ShowHideRelatedContentsAction}.
+ * @since 3.0
  */
 public class ShowHideRelatedContentsHandler extends AbstractShowHideHandler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CreateLollipopPortCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CreateLollipopPortCommand.java
index f24f6147d11..7d229cd832a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CreateLollipopPortCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CreateLollipopPortCommand.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * this class is used to create the lollipop interface from a port
+ * @since 3.0
  *
  */
 public class CreateLollipopPortCommand extends RecordingCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CustomPortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CustomPortCreateCommand.java
index 7180fad0e0f..418f01e6282 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CustomPortCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/CustomPortCreateCommand.java
@@ -1,83 +1,84 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * 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:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * Port creation command used to create Port on a Property (no direct containment link between
- * Property and Port).
- *
- */
-public class CustomPortCreateCommand extends org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand {
-
-	/** Constructor **/
-	public CustomPortCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req, diagram);
-	}
-
-	/**
-	 * <pre>
-	 * Checks if the Port can be created on the Property.
-	 * The Property must be typed by a StructuredClassifier (in other words, an element that
-	 * can own Port). The new Port is owned be the type of the Property.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	public boolean canExecute() {
-		Property target = (Property) getElementToEdit();
-
-		if ((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * <pre>
-	 * Custom creation of the Port :
-	 * - resolve the Property type
-	 * - add a new Port on this type.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Port newElement = UMLFactory.eINSTANCE.createPort();
-
-		StructuredClassifier owner = (StructuredClassifier) ((Property) getElementToEdit()).getType();
-		owner.getOwnedAttributes().add(newElement);
-
-		ElementInitializers.getInstance().init_Port_Shape(newElement);
-
-		doConfigure(newElement, monitor, info);
-
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *
+ * 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:
+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.command;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.StructuredClassifier;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * Port creation command used to create Port on a Property (no direct containment link between
+ * Property and Port).
+ * @since 3.0
+ *
+ */
+public class CustomPortCreateCommand extends org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand {
+
+	/** Constructor **/
+	public CustomPortCreateCommand(CreateElementRequest req, Diagram diagram) {
+		super(req, diagram);
+	}
+
+	/**
+	 * <pre>
+	 * Checks if the Port can be created on the Property.
+	 * The Property must be typed by a StructuredClassifier (in other words, an element that
+	 * can own Port). The new Port is owned be the type of the Property.
+	 *
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	public boolean canExecute() {
+		Property target = (Property) getElementToEdit();
+
+		if ((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * <pre>
+	 * Custom creation of the Port :
+	 * - resolve the Property type
+	 * - add a new Port on this type.
+	 *
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		Port newElement = UMLFactory.eINSTANCE.createPort();
+
+		StructuredClassifier owner = (StructuredClassifier) ((Property) getElementToEdit()).getType();
+		owner.getOwnedAttributes().add(newElement);
+
+		ElementInitializers.getInstance().init_Port_Shape(newElement);
+
+		doConfigure(newElement, monitor, info);
+
+		((CreateElementRequest) getRequest()).setNewElement(newElement);
+		return CommandResult.newOKCommandResult(newElement);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/DeferredSetViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/DeferredSetViewCommand.java
index 0e033a75c3f..a23bcdfe65e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/DeferredSetViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/DeferredSetViewCommand.java
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
 /**
  * this command is used to set a value of a view during the execution
  * as deferred command
+ * @since 3.0
  *
  */
 public class DeferredSetViewCommand extends AbstractTransactionalCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/LollipopToRectangleCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/LollipopToRectangleCommand.java
index 6767c709cc4..44f3e15c175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/LollipopToRectangleCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/LollipopToRectangleCommand.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * this is the specific command in charge to transform an element editpart into a defaultShape
+ * @since 3.0
  *
  */
 public class LollipopToRectangleCommand extends AbstractTransactionalCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/RectangleToLollipopCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/RectangleToLollipopCommand.java
index f0ed2c6ad3c..06f2305458b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/RectangleToLollipopCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/RectangleToLollipopCommand.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * this is the specific command in charge to transform an element editpart into a defaultShape
+ * @since 3.0
  *
  */
 public class RectangleToLollipopCommand extends AbstractTransactionalCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/AssociationClassViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/AssociationClassViewCreateCommand.java
index aed75a16414..281fc934630 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/AssociationClassViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/AssociationClassViewCreateCommand.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * Custom class to create the associationClass node.
+ * @since 3.0
  *
  */
 public class AssociationClassViewCreateCommand extends AbstractTransactionalCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/BranchDependenctReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/BranchDependenctReorientCommand.java
index 9f546ae6ffa..c201d9904ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/BranchDependenctReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/BranchDependenctReorientCommand.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.Package;
 
 /**
  * because of the nature of this relation the test about can execute has to be change
+ * @since 3.0
  *
  */
 public class BranchDependenctReorientCommand extends DependencyBranchReorientCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CreateViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CreateViewCommand.java
index c68eb02de5c..2cfff7b2a03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CreateViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CreateViewCommand.java
@@ -22,6 +22,7 @@ import org.eclipse.gmf.runtime.notation.View;
 
 /**
  * The Class CreateViewCommand.
+ * @since 3.0
  */
 public class CreateViewCommand extends CreateCommand {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CustomDeferredCreateConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CustomDeferredCreateConnectionViewCommand.java
index 1a96db28258..83b2bd4c22a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CustomDeferredCreateConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/CustomDeferredCreateConnectionViewCommand.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.commands.CommonDeferredCreateCon
  * This class is used to create a connection view
  *
  * @author Patrick Tessier
+ * @since 3.0
  */
 public class CustomDeferredCreateConnectionViewCommand extends CommonDeferredCreateConnectionViewCommand {
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/DependencyDiamonViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/DependencyDiamonViewCreateCommand.java
index 14ce664b7b3..47323c1db1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/DependencyDiamonViewCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/DependencyDiamonViewCreateCommand.java
@@ -40,6 +40,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * Custom class to create the associationClass node
+ * @since 3.0
  *
  */
 public class DependencyDiamonViewCreateCommand extends AbstractTransactionalCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ElementToStereotypedShape.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ElementToStereotypedShape.java
index c443a234d30..bb19da4dd93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ElementToStereotypedShape.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ElementToStereotypedShape.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider;
 
 /**
  * this is the specific command in charge to transform an element editpart into a shape_namedElement Editpart
+ * @since 3.0
  *
  */
 public class ElementToStereotypedShape extends RecordingCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyBranchEditPart.java
index a4d3472b327..8e2c9678360 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyBranchEditPart.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPa
 
 /**
  * this a specific editpart used to overload the method createNodePlate
+ * @since 3.0
  */
 public class CustomDependencyBranchEditPart extends DependencyBranchEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyNodeEditPart.java
index bee045196f4..a3342088237 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomDependencyNodeEditPart.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPa
 
 /**
  * this a specific editpart used to overload the method createNodePlate
+ * @since 3.0
  */
 public class CustomDependencyNodeEditPart extends DependencyNodeEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
index d59e20405ff..a53fe1564cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
 /**
  * This class is used to add behavior to reorient the lollipop or the required interface representation
+ * @since 3.0
  *
  */
 public class CustomInterfaceEditPart extends InterfaceEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceRealizationEditPart.java
index 2002a304582..77d7fe18407 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceRealizationEditPart.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealization
 
 /**
  * this class is used to display an interface Realization as UML or as fill line for lollipop
+ * @since 3.0
  *
  */
 public class CustomInterfaceRealizationEditPart extends InterfaceRealizationEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
index 66533321a36..ceb20417402 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
 
 /**
  * this a specific editpart used to overload the method createNodePlate
+ * @since 3.0
  */
 public class CustomModelEditPart extends ModelEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
index 7c3e2315df8..4770c6c1a8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
 
 /**
  * this a specific editpart used to overload the method createNodePlate
+ * @since 3.0
  */
 public class CustomModelEditPartCN extends ModelEditPartCN {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortAppliedStereotypeEditPart.java
index 730fa5d4cc6..a59a7c9f8e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortAppliedStereotypeEditPart.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionE
 
 /**
  * The custom edit policy for the port applied stereotype.
+ * @since 3.0
  */
 public class CustomPortAppliedStereotypeEditPart extends PortAppliedStereotypeEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
index 0f2de588ae7..8040b043cba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortEditPart.java
@@ -24,6 +24,9 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
 
 
 
+/**
+ * @since 3.0
+ */
 public class CustomPortEditPart extends PortEditPart {
 
 	public CustomPortEditPart(View view) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortNameEditPart.java
index 0d9f3a48c17..cb62d09922b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPortNameEditPart.java
@@ -1,72 +1,73 @@
-package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
-
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * 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:
- *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440224 : Label Alignment
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Text alignment implementation
- *
- *****************************************************************************/
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.locator.IPapyrusBorderItemLocator;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
-
-/**
- * The Class CustomPortNameEditPart.
- */
-public class CustomPortNameEditPart extends PortNameEditPart {
-
-	/**
-	 * Instantiates a new custom port name edit part.
-	 *
-	 * @param view
-	 *            the view
-	 */
-	public CustomPortNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Gets the default text alignment.
-	 *
-	 * @return the default text alignment
-	 */
-	@Override
-	protected int getDefaultTextAlignment() {
-		return PositionConstants.LEFT;
-	}
-
-	/**
-	 * Refresh Bounds of PortName EditPart
-	 */
-	@Override
-	public void refreshBounds() {
-		int dx = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int dy = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-
-		Point offset = new Point(dx, dy);
-
-		if (borderLabelLocator == null) {
-			borderLabelLocator = (IPapyrusBorderItemLocator) getBorderItemLocator();
-		}
-		if (offset != null) {
-			borderLabelLocator.setConstraint(new Rectangle(offset.x, offset.y, 0, 0));
-		}
-		borderLabelLocator.setView((View) getModel());
-		borderLabelLocator.setTextAlignment(getTextAlignment());
-		borderLabelLocator.setEditpart(this);
-		getFigure().getParent().setConstraint(getFigure(), borderLabelLocator);
-	}
-}
+package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
+
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ *
+ * 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:
+ *  Céline Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 440224 : Label Alignment
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Text alignment implementation
+ *
+ *****************************************************************************/
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.locator.IPapyrusBorderItemLocator;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
+
+/**
+ * The Class CustomPortNameEditPart.
+ * @since 3.0
+ */
+public class CustomPortNameEditPart extends PortNameEditPart {
+
+	/**
+	 * Instantiates a new custom port name edit part.
+	 *
+	 * @param view
+	 *            the view
+	 */
+	public CustomPortNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * Gets the default text alignment.
+	 *
+	 * @return the default text alignment
+	 */
+	@Override
+	protected int getDefaultTextAlignment() {
+		return PositionConstants.LEFT;
+	}
+
+	/**
+	 * Refresh Bounds of PortName EditPart
+	 */
+	@Override
+	public void refreshBounds() {
+		int dx = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
+		int dy = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+
+		Point offset = new Point(dx, dy);
+
+		if (borderLabelLocator == null) {
+			borderLabelLocator = (IPapyrusBorderItemLocator) getBorderItemLocator();
+		}
+		if (offset != null) {
+			borderLabelLocator.setConstraint(new Rectangle(offset.x, offset.y, 0, 0));
+		}
+		borderLabelLocator.setView((View) getModel());
+		borderLabelLocator.setTextAlignment(getTextAlignment());
+		borderLabelLocator.setEditpart(this);
+		getFigure().getParent().setConstraint(getFigure(), borderLabelLocator);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPropertyPartEditPartCN.java
index 9f57948c74a..044cbfe7afd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPropertyPartEditPartCN.java
@@ -1,81 +1,82 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * 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:
- *  Patrick Tessier (CEA LIST)- Initial API and implementation
- /*****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <pre>
- * This class will be inherited by the GMF generated {@link org.eclipse.papyrus.uml.diagram.CustomPropertyPartEditPartCN.edit.parts.PropertyPartEditPartCN}
- * in order to refresh the related figure when when the Property::aggregation eAttribute value
- * changes.
- * </pre>
- */
-public abstract class CustomPropertyPartEditPartCN extends NamedElementEditPart {
-
-	/**
-	 * Constructor
-	 *
-	 * @param view
-	 */
-	public CustomPropertyPartEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * <pre>
-	 * Calls the figure refresh when a change event is detected on
-	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification event) {
-
-		if ((resolveSemanticElement() != null) && (resolveSemanticElement().equals(event.getNotifier()))) {
-			if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
-				refreshVisuals();
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-
-	/**
-	 * <pre>
-	 * Refresh the figure with dashed border when Property aggregation value is SHARED.
-	 * Else set the border style to solid line.
-	 *
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		if ((resolveSemanticElement() != null) && (resolveSemanticElement() instanceof Property)) {
-			if (((Property) resolveSemanticElement()).getAggregation().equals(AggregationKind.SHARED_LITERAL)) {
-				getPrimaryShape().setLineStyle(Graphics.LINE_CUSTOM);
-			} else {
-				getPrimaryShape().setLineStyle(Graphics.LINE_SOLID);
-			}
-		}
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * 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:
+ *  Patrick Tessier (CEA LIST)- Initial API and implementation
+ /*****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
+import org.eclipse.uml2.uml.AggregationKind;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * <pre>
+ * This class will be inherited by the GMF generated {@link org.eclipse.papyrus.uml.diagram.CustomPropertyPartEditPartCN.edit.parts.PropertyPartEditPartCN}
+ * in order to refresh the related figure when when the Property::aggregation eAttribute value
+ * changes.
+ * </pre>
+ * @since 3.0
+ */
+public abstract class CustomPropertyPartEditPartCN extends NamedElementEditPart {
+
+	/**
+	 * Constructor
+	 *
+	 * @param view
+	 */
+	public CustomPropertyPartEditPartCN(View view) {
+		super(view);
+	}
+
+	/**
+	 * <pre>
+	 * Calls the figure refresh when a change event is detected on
+	 * UMLPackage.eINSTANCE.getProperty_Aggregation().
+	 *
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+
+		if ((resolveSemanticElement() != null) && (resolveSemanticElement().equals(event.getNotifier()))) {
+			if (UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {
+				refreshVisuals();
+			}
+		}
+		super.handleNotificationEvent(event);
+	}
+
+
+	/**
+	 * <pre>
+	 * Refresh the figure with dashed border when Property aggregation value is SHARED.
+	 * Else set the border style to solid line.
+	 *
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		if ((resolveSemanticElement() != null) && (resolveSemanticElement() instanceof Property)) {
+			if (((Property) resolveSemanticElement()).getAggregation().equals(AggregationKind.SHARED_LITERAL)) {
+				getPrimaryShape().setLineStyle(Graphics.LINE_CUSTOM);
+			} else {
+				getPrimaryShape().setLineStyle(Graphics.LINE_SOLID);
+			}
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomUsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomUsageEditPart.java
index 412eaa639a0..c9bff87c1ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomUsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomUsageEditPart.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
 
 /**
  * this class is used to display an interface Realization as UML or as fill line for lollipop
+ * @since 3.0
  *
  */
 public class CustomUsageEditPart extends UsageEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
index bee80577529..64e7aeaea63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/ResizablePortEditPart.java
@@ -32,6 +32,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
  * 2. Override Affixed_child_alignment_role policy for resize commands
  * 
  * @author Trung-Truc Nguyen
+ * @since 3.0
  *
  */
 public class ResizablePortEditPart extends PortEditPart {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java
index 440975aed3a..103a8578d3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AbstractCustomLabelEditPolicy.java
@@ -25,6 +25,7 @@ import org.eclipse.uml2.uml.Element;
 
 /**
  * Edit policy for specific Label.
+ * @since 3.0
  */
 public abstract class AbstractCustomLabelEditPolicy extends GraphicalEditPolicy implements IPapyrusListener, NotificationListener {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypeOperationDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypeOperationDisplayEditPolicy.java
index 759637c8b43..8a848330004 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypeOperationDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypeOperationDisplayEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.Operation;
 /**
  * Specific edit policy for label displaying stereotypes and their properties for edges representing
  * UML elements.
+ * @since 3.0
  */
 public class AppliedStereotypeOperationDisplayEditPolicy extends AbstractAppliedStereotypeDisplayEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypePropertyDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypePropertyDisplayEditPolicy.java
index bfab47e1da8..27be399db52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypePropertyDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/AppliedStereotypePropertyDisplayEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.Property;
 /**
  * Specific edit policy for label displaying stereotypes and their properties for edges representing
  * UML elements.
+ * @since 3.0
  */
 public class AppliedStereotypePropertyDisplayEditPolicy extends AbstractAppliedStereotypeDisplayEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ComponentDiagramChangeStereotypedShapeEditpolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ComponentDiagramChangeStereotypedShapeEditpolicy.java
index 070aa7819f8..feaddf344fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ComponentDiagramChangeStereotypedShapeEditpolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ComponentDiagramChangeStereotypedShapeEditpolicy.java
@@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Display;
 
 /**
  * the goal of this class is to allow changing the aspect of an element by taking in account its stereotype
+ * @since 3.0
  *
  */
 public class ComponentDiagramChangeStereotypedShapeEditpolicy extends ChangeStereotypedShapeEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
index d24e7a81ace..a0f4ccab16a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -76,6 +76,7 @@ import org.eclipse.uml2.uml.TypedElement;
 /**
  * This class provides an implementation for specific behavior of Drag and Drop
  * in the Composite Diagram.
+ * @since 3.0
  */
 public class CustomDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPolicy {
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomGraphicalNodeEditPolicy.java
index 6df46f63475..5bee312ada3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomGraphicalNodeEditPolicy.java
@@ -1,175 +1,176 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * 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:
- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers.MultiDependencyHelper;
-import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
-
-/**
- * This class is used to launch command to create associationClass
- *
- * @author Patrick Tessier
- */
-public class CustomGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
-	/** The ID for the additional parameter SOURCE_PARENT used in creation request. */
-	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_PARENT = "SOURCE_PARENT"; //$NON-NLS-1$
-	/** The ID for the additional parameter TARGET_PARENT used in creation request. */
-	public static final String CONNECTOR_CREATE_REQUEST_TARGET_PARENT = "TARGET_PARENT"; //$NON-NLS-1$
-	/** The ID for the additional parameter SOURCE_GRAPHICAL used in creation request. */
-	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL = "SOURCE_GRAPHICAL"; //$NON-NLS-1$
-	/** The ID for the additional parameter TARGET_GRAPHICAL used in creation request. */
-	public static final String CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL = "TARGET_GRAPHICAL"; //$NON-NLS-1$
-
-	/**
-	 * <pre>
-	 * This method is overridden in order to add information (graphical parent of Port)
-	 * in the CreationRelationshipRequest.
-	 *
-	 * These information is stored in the request as Parameters under the following keys:
-	 * - &quot;SOURCE_PARENT&quot; : UML Element used as Graphical parent of the source Port (end of Connector)
-	 * - &quot;TARGET_PARENT&quot; : UML Element used as Graphical parent of the target Port (end of Connector)
-	 * - &quot;SOURCE_GRAPHICAL&quot; : GraphicalEditPart of the source
-	 * - &quot;TARGET_GRAPHICAL&quot; : GraphicalEditPart of the target
-	 *
-	 * This method is used too to call the custom command for InformationFlow creation.
-	 *
-	 * @param request the request
-	 * @return the connection and relationship complete command
-	 * {@inheritDoc}
-	 * </pre>
-	 */
-	@Override
-	protected Command getConnectionAndRelationshipCompleteCommand(CreateConnectionViewAndElementRequest request) {
-		// get the element descriptor
-		CreateElementRequestAdapter requestAdapter = request.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-		// get the semantic request
-		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
-		createElementRequest.setPrompt(!request.isUISupressed());
-		// complete the semantic request by filling in the source and
-		// destination
-		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
-		View sourceView = (View) request.getSourceEditPart().getModel();
-		View targetView = (View) targetEP.getModel();
-		// resolve the source
-		EObject source = ViewUtil.resolveSemanticElement(sourceView);
-		if (source == null) {
-			source = sourceView;
-		}
-		// resolve the source parent (meaning graphical parent here)
-		Object sourceParentViewObject = request.getSourceEditPart().getParent().getModel();
-		if(!(sourceParentViewObject instanceof View)) {
-			// parent view is not a view (in case of a cretion of a Dependency on a Dependency link for example)
-			return super.getConnectionAndRelationshipCompleteCommand(request);
-		}
-		View sourceParentView = (View)sourceParentViewObject;
-		EObject sourceParent = ViewUtil.resolveSemanticElement(sourceParentView);
-		if (sourceParent == null) {
-			sourceParent = sourceParentView;
-		}
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_PARENT, sourceParent);
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL, request.getSourceEditPart());
-		createElementRequest.setSource(source);
-		// resolve the target
-		EObject target = ViewUtil.resolveSemanticElement(targetView);
-		if (target == null) {
-			target = targetView;
-		}
-		// resolve the target parent (meaning graphical parent here)
-		Object targetParentViewObject = request.getSourceEditPart().getParent().getModel();
-		if(!(targetParentViewObject instanceof View)) {
-			// parent view is not a view (in case of a cretion of a Dependency on a Dependency link for example)
-			return super.getConnectionAndRelationshipCompleteCommand(request);
-		}
-		View targetParentView = (View)targetParentViewObject;
-		EObject targetParent = ViewUtil.resolveSemanticElement(targetParentView);
-		if (targetParent == null) {
-			targetParent = targetParentView;
-		}
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_PARENT, targetParent);
-		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL, request.getTargetEditPart());
-		createElementRequest.setTarget(target);
-		Command createElementCommand = null;
-		// get the create element request based on the elementdescriptor's
-		// request
-		createElementCommand = targetEP.getCommand(new EditCommandRequestWrapper((CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class), request.getExtendedData()));
-		// create the create semantic element wrapper command
-		if (null == createElementCommand) {
-			return null;
-		}
-		SemanticCreateCommand semanticCommand = new SemanticCreateCommand(requestAdapter, createElementCommand);
-		// get the view command
-		Command viewCommand = getConnectionCompleteCommand(request);
-		if (null == viewCommand) {
-			return null;
-		}
-		// form the compound command and return
-		CompositeCommand cc = new CompositeCommand(semanticCommand.getLabel());
-		cc.compose(semanticCommand);
-		cc.compose(new CommandProxy(viewCommand));
-		return new ICommandProxy(cc);
-	}
-
-	/**
-	 *
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Command getCommand(Request request) {
-		// we have to distinguish the case where this is an association class
-		if (REQ_CONNECTION_END.equals(request.getType())) {
-			if (request instanceof CreateConnectionViewAndElementRequest) {
-				// default behavior
-				Command c = getConnectionAndRelationshipCompleteCommand((CreateConnectionViewAndElementRequest) request);
-				// case of associationClass
-				CreateElementRequestAdapter requestAdapter = ((CreateConnectionViewAndElementRequest) request).getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-				CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
-				if (UMLElementTypes.Dependency_BranchEdge.equals(createElementRequest.getElementType())) {
-					MultiDependencyHelper multiDependencyHelper = new MultiDependencyHelper(getEditingDomain());
-					return multiDependencyHelper.getCommand(((CreateConnectionViewAndElementRequest) request), c);
-				} else {
-					return c;
-				}
-			} else if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-				return getUnspecifiedConnectionCompleteCommand((CreateUnspecifiedTypeConnectionRequest) request);
-			}
-		}
-		return super.getCommand(request);
-	}
-
-	/**
-	 * used to obtain the transactional edit domain
-	 *
-	 * @return the current transactional edit domain
-	 */
-	private TransactionalEditingDomain getEditingDomain() {
-		return ((IGraphicalEditPart) getHost()).getEditingDomain();
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers.MultiDependencyHelper;
+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
+
+/**
+ * This class is used to launch command to create associationClass
+ *
+ * @author Patrick Tessier
+ * @since 3.0
+ */
+public class CustomGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
+	/** The ID for the additional parameter SOURCE_PARENT used in creation request. */
+	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_PARENT = "SOURCE_PARENT"; //$NON-NLS-1$
+	/** The ID for the additional parameter TARGET_PARENT used in creation request. */
+	public static final String CONNECTOR_CREATE_REQUEST_TARGET_PARENT = "TARGET_PARENT"; //$NON-NLS-1$
+	/** The ID for the additional parameter SOURCE_GRAPHICAL used in creation request. */
+	public static final String CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL = "SOURCE_GRAPHICAL"; //$NON-NLS-1$
+	/** The ID for the additional parameter TARGET_GRAPHICAL used in creation request. */
+	public static final String CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL = "TARGET_GRAPHICAL"; //$NON-NLS-1$
+
+	/**
+	 * <pre>
+	 * This method is overridden in order to add information (graphical parent of Port)
+	 * in the CreationRelationshipRequest.
+	 *
+	 * These information is stored in the request as Parameters under the following keys:
+	 * - &quot;SOURCE_PARENT&quot; : UML Element used as Graphical parent of the source Port (end of Connector)
+	 * - &quot;TARGET_PARENT&quot; : UML Element used as Graphical parent of the target Port (end of Connector)
+	 * - &quot;SOURCE_GRAPHICAL&quot; : GraphicalEditPart of the source
+	 * - &quot;TARGET_GRAPHICAL&quot; : GraphicalEditPart of the target
+	 *
+	 * This method is used too to call the custom command for InformationFlow creation.
+	 *
+	 * @param request the request
+	 * @return the connection and relationship complete command
+	 * {@inheritDoc}
+	 * </pre>
+	 */
+	@Override
+	protected Command getConnectionAndRelationshipCompleteCommand(CreateConnectionViewAndElementRequest request) {
+		// get the element descriptor
+		CreateElementRequestAdapter requestAdapter = request.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
+		// get the semantic request
+		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
+		createElementRequest.setPrompt(!request.isUISupressed());
+		// complete the semantic request by filling in the source and
+		// destination
+		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
+		View sourceView = (View) request.getSourceEditPart().getModel();
+		View targetView = (View) targetEP.getModel();
+		// resolve the source
+		EObject source = ViewUtil.resolveSemanticElement(sourceView);
+		if (source == null) {
+			source = sourceView;
+		}
+		// resolve the source parent (meaning graphical parent here)
+		Object sourceParentViewObject = request.getSourceEditPart().getParent().getModel();
+		if(!(sourceParentViewObject instanceof View)) {
+			// parent view is not a view (in case of a cretion of a Dependency on a Dependency link for example)
+			return super.getConnectionAndRelationshipCompleteCommand(request);
+		}
+		View sourceParentView = (View)sourceParentViewObject;
+		EObject sourceParent = ViewUtil.resolveSemanticElement(sourceParentView);
+		if (sourceParent == null) {
+			sourceParent = sourceParentView;
+		}
+		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_PARENT, sourceParent);
+		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL, request.getSourceEditPart());
+		createElementRequest.setSource(source);
+		// resolve the target
+		EObject target = ViewUtil.resolveSemanticElement(targetView);
+		if (target == null) {
+			target = targetView;
+		}
+		// resolve the target parent (meaning graphical parent here)
+		Object targetParentViewObject = request.getSourceEditPart().getParent().getModel();
+		if(!(targetParentViewObject instanceof View)) {
+			// parent view is not a view (in case of a cretion of a Dependency on a Dependency link for example)
+			return super.getConnectionAndRelationshipCompleteCommand(request);
+		}
+		View targetParentView = (View)targetParentViewObject;
+		EObject targetParent = ViewUtil.resolveSemanticElement(targetParentView);
+		if (targetParent == null) {
+			targetParent = targetParentView;
+		}
+		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_PARENT, targetParent);
+		createElementRequest.setParameter(CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL, request.getTargetEditPart());
+		createElementRequest.setTarget(target);
+		Command createElementCommand = null;
+		// get the create element request based on the elementdescriptor's
+		// request
+		createElementCommand = targetEP.getCommand(new EditCommandRequestWrapper((CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class), request.getExtendedData()));
+		// create the create semantic element wrapper command
+		if (null == createElementCommand) {
+			return null;
+		}
+		SemanticCreateCommand semanticCommand = new SemanticCreateCommand(requestAdapter, createElementCommand);
+		// get the view command
+		Command viewCommand = getConnectionCompleteCommand(request);
+		if (null == viewCommand) {
+			return null;
+		}
+		// form the compound command and return
+		CompositeCommand cc = new CompositeCommand(semanticCommand.getLabel());
+		cc.compose(semanticCommand);
+		cc.compose(new CommandProxy(viewCommand));
+		return new ICommandProxy(cc);
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Command getCommand(Request request) {
+		// we have to distinguish the case where this is an association class
+		if (REQ_CONNECTION_END.equals(request.getType())) {
+			if (request instanceof CreateConnectionViewAndElementRequest) {
+				// default behavior
+				Command c = getConnectionAndRelationshipCompleteCommand((CreateConnectionViewAndElementRequest) request);
+				// case of associationClass
+				CreateElementRequestAdapter requestAdapter = ((CreateConnectionViewAndElementRequest) request).getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
+				CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class);
+				if (UMLElementTypes.Dependency_BranchEdge.equals(createElementRequest.getElementType())) {
+					MultiDependencyHelper multiDependencyHelper = new MultiDependencyHelper(getEditingDomain());
+					return multiDependencyHelper.getCommand(((CreateConnectionViewAndElementRequest) request), c);
+				} else {
+					return c;
+				}
+			} else if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
+				return getUnspecifiedConnectionCompleteCommand((CreateUnspecifiedTypeConnectionRequest) request);
+			}
+		}
+		return super.getCommand(request);
+	}
+
+	/**
+	 * used to obtain the transactional edit domain
+	 *
+	 * @return the current transactional edit domain
+	 */
+	private TransactionalEditingDomain getEditingDomain() {
+		return ((IGraphicalEditPart) getHost()).getEditingDomain();
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
index 167aa3ee7e6..12097aacecf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/ExternalLabelPrimaryDragRoleEditPolicy.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
  * external node label.
  * The expected behavior is to provide an external label that can freely move and with a link feedback
  * towards its parent figure during the move.
+ * @since 3.0
  */
 public class ExternalLabelPrimaryDragRoleEditPolicy extends NonResizableLabelEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
index 9d05df8bd17..7dc4dfdf416 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
  * In particular it installs {@link ExternalLabelPrimaryDragRoleEditPolicy} on
  * children that are external label.
  * The code generated by GMF can be found in {@link PortEditPart#createLayoutEditPolicy()}.
+ * @since 3.0
  */
 public class PortLayoutEditPolicy extends LayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java
index 2ea0d49afda..a8e9ffc4a6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java
@@ -1,29 +1,30 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;
-
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN;
-
-
-/**
- * This edit policy replaces the GMF generated edit policy for Property used as Part in composite structure diagram.
- * In particular it provides a getCreateCommands that add a ChangeBoundRequest on a created Port
- * in order to locate it at the cursor position.
- * This class inherits from StructuredClassifierLayoutEditPolicy which provides support for a correct placement of
- * port during creation.
- * An example of code generated by GMF can be found in {@link CustomPropertyPartEditPartCN#createLayoutEditPolicy()}.
- */
-public class PropertyLayoutEditPolicy extends StructuredClassifierLayoutEditPolicy {
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;
+
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPropertyPartEditPartCN;
+
+
+/**
+ * This edit policy replaces the GMF generated edit policy for Property used as Part in composite structure diagram.
+ * In particular it provides a getCreateCommands that add a ChangeBoundRequest on a created Port
+ * in order to locate it at the cursor position.
+ * This class inherits from StructuredClassifierLayoutEditPolicy which provides support for a correct placement of
+ * port during creation.
+ * An example of code generated by GMF can be found in {@link CustomPropertyPartEditPartCN#createLayoutEditPolicy()}.
+ * @since 3.0
+ */
+public class PropertyLayoutEditPolicy extends StructuredClassifierLayoutEditPolicy {
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/RemoveOrphanViewPolicy.java
index b608b1adc71..12ab331d60d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/RemoveOrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/RemoveOrphanViewPolicy.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy;
  *
  * See RemoveOrphanViewPolicy in Class Diagram
  * </pre>
+ * @since 3.0
  */
 public class RemoveOrphanViewPolicy extends OrphanViewPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/StructuredClassifierLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/StructuredClassifierLayoutEditPolicy.java
index 07b124979ff..b7ad2090832 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/StructuredClassifierLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/StructuredClassifierLayoutEditPolicy.java
@@ -44,6 +44,7 @@ import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
  * In particular it provides a getCreateCommands that add a ChangeBoundRequest on a created Port
  * in order to locate it at the cursor position.
  * An example of code generated by GMF can be found in {@link ClassCompositeEditPart#createLayoutEditPolicy()}.
+ * @since 3.0
  */
 public class StructuredClassifierLayoutEditPolicy extends LayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDefaultNamedElementItemSemanticEditPolicy.java
index b76139b18ed..6701024d4e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDefaultNamedElementItemSemanticEditPolicy.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.policies.DefaultNamedEleme
 
 /**
  * this class has been specialized in order to manage reconnection of multidependency
+ * @since 3.0
  *
  */
 public class CustomDefaultNamedElementItemSemanticEditPolicy extends DefaultNamedElementItemSemanticEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDependencyBranchSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDependencyBranchSemanticEditPolicy.java
index fd4dfacd2f4..970becce761 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDependencyBranchSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/CustomDependencyBranchSemanticEditPolicy.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;
 
 /**
  * this class is used to forbid the creation of a dependency branch on a dependency branch.
+ * @since 3.0
  *
  */
 public class CustomDependencyBranchSemanticEditPolicy extends DependencyBranchItemSemanticEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
index d70743cd612..ed267cff736 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
@@ -1,80 +1,81 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * 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:
- *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
- /*****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.factory;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyBranchEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPortAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPortNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomUsageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.ResizablePortEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
-
-/**
- * Custom EditPartFactory
- *
- */
-public class CustomUMLEditPartFactory extends UMLEditPartFactory {
-
-	@Override
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof View) {
-			View view = (View) model;
-			switch (UMLVisualIDRegistry.getVisualID(view)) {
-
-			// redefined classes to modify the method createNodePlate
-			case InterfaceEditPartPCN.VISUAL_ID:
-				return new CustomInterfaceEditPart(view);
-			case InterfaceEditPart.VISUAL_ID:
-				return new CustomInterfaceEditPart(view);
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return new CustomInterfaceRealizationEditPart(view);
-			case UsageEditPart.VISUAL_ID:
-				return new CustomUsageEditPart(view);
-			case ModelEditPart.VISUAL_ID:
-				return new CustomModelEditPart(view);
-			case ModelEditPartCN.VISUAL_ID:
-				return new CustomModelEditPartCN(view);
-			case DependencyNodeEditPart.VISUAL_ID:
-				return new CustomDependencyNodeEditPart(view);
-			case DependencyBranchEditPart.VISUAL_ID:
-				return new CustomDependencyBranchEditPart(view);
-			case PortNameEditPart.VISUAL_ID:
-				return new CustomPortNameEditPart(view);
-			case PortAppliedStereotypeEditPart.VISUAL_ID:
-				return new CustomPortAppliedStereotypeEditPart(view);
-			case PortEditPart.VISUAL_ID:
-				return new ResizablePortEditPart(view);
-			}
-		}
-		return super.createEditPart(context, model);
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * 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:
+ *  Nizar GUEDIDI (CEA LIST) - Initial API and implementation
+ /*****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.component.custom.factory;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyBranchEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPortAppliedStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomPortNameEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomUsageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.ResizablePortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UMLEditPartFactory;
+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;
+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;
+
+/**
+ * Custom EditPartFactory
+ * @since 3.0
+ *
+ */
+public class CustomUMLEditPartFactory extends UMLEditPartFactory {
+
+	@Override
+	public EditPart createEditPart(EditPart context, Object model) {
+		if (model instanceof View) {
+			View view = (View) model;
+			switch (UMLVisualIDRegistry.getVisualID(view)) {
+
+			// redefined classes to modify the method createNodePlate
+			case InterfaceEditPartPCN.VISUAL_ID:
+				return new CustomInterfaceEditPart(view);
+			case InterfaceEditPart.VISUAL_ID:
+				return new CustomInterfaceEditPart(view);
+			case InterfaceRealizationEditPart.VISUAL_ID:
+				return new CustomInterfaceRealizationEditPart(view);
+			case UsageEditPart.VISUAL_ID:
+				return new CustomUsageEditPart(view);
+			case ModelEditPart.VISUAL_ID:
+				return new CustomModelEditPart(view);
+			case ModelEditPartCN.VISUAL_ID:
+				return new CustomModelEditPartCN(view);
+			case DependencyNodeEditPart.VISUAL_ID:
+				return new CustomDependencyNodeEditPart(view);
+			case DependencyBranchEditPart.VISUAL_ID:
+				return new CustomDependencyBranchEditPart(view);
+			case PortNameEditPart.VISUAL_ID:
+				return new CustomPortNameEditPart(view);
+			case PortAppliedStereotypeEditPart.VISUAL_ID:
+				return new CustomPortAppliedStereotypeEditPart(view);
+			case PortEditPart.VISUAL_ID:
+				return new ResizablePortEditPart(view);
+			}
+		}
+		return super.createEditPart(context, model);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java
index d088c33a5e8..d2c294d6281 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
 
 /**
  * Figure for Connector representation.
+ * @since 3.0
  */
 public class ConnectorFigure extends UMLEdgeFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/InterfaceRealizationLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/InterfaceRealizationLinkFigure.java
index 58f251361f8..45c4d4e98eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/InterfaceRealizationLinkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/InterfaceRealizationLinkFigure.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFi
 /**
  * this class has to option to display it:
  * normal with the UML view or as a link to display lollipop
+ * @since 3.0
  *
  */
 public class InterfaceRealizationLinkFigure extends InterfaceRealizationFigure {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageDecoration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageDecoration.java
index c856af51ed8..2ac58f67148 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageDecoration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageDecoration.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;
 
 /**
  * The Class UsageDecoration.
+ * @since 3.0
  */
 public class UsageDecoration extends PapyrusEdgeFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
index 47d738a0141..0a569652245 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 /**
  * this class has to option to display it:
  * normal with the UML view or as a link to display lollipop
+ * @since 3.0
  **/
 public class UsageLinkFigure extends DashedEdgeFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/CompositeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/CompositeFigure.java
index 2c40cc93911..e4d17db8a96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/CompositeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/CompositeFigure.java
@@ -26,6 +26,7 @@ import org.eclipse.swt.graphics.Image;
 
 /**
  * Figure for Composite representation of Class.
+ * @since 3.0
  */
 public class CompositeFigure extends RoundedCompartmentFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/InterfaceAsCercle_nameLabel.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/InterfaceAsCercle_nameLabel.java
index 7e8e9982852..4979f10c712 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/InterfaceAsCercle_nameLabel.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/InterfaceAsCercle_nameLabel.java
@@ -10,6 +10,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;
 
+/**
+ * @since 3.0
+ */
 public class InterfaceAsCercle_nameLabel extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel {
 	public InterfaceAsCercle_nameLabel() {
 		this.setText("");
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
index dffde8f5320..4cc52b4a10c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
@@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Image;
 
 /**
  * Figure for Required interface. It draws an half circle.
+ * @since 3.0
  */
 public class LollipopInterfaceFigure extends RoundedCompartmentFigure implements IPapyrusNodeUMLElementFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PortFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PortFigure.java
index 5b8e4478d00..c6c7e506d01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PortFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PortFigure.java
@@ -16,6 +16,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFig
 
 /**
  * The Class PortFigure.
+ * @since 3.0
  */
 public class PortFigure extends AffixedNamedElementFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
index 0d0a12dd8cf..0b2e388abab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;
 
 /**
  * Figure for Composite representation of Class.
+ * @since 3.0
  */
 public class PropertyPartFigure extends CompartmentFigure {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/log/Log.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/log/Log.java
index 5a8d2fbc3d1..412b89894f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/log/Log.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/log/Log.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;
 
 /**
  * Log singleton class for CSD.
+ * @since 3.0
  */
 public class Log extends LogHelper {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/Messages.java
index d5ba3e64ea1..dba743bc272 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/messages/Messages.java
@@ -17,6 +17,7 @@ import org.eclipse.osgi.util.NLS;
 
 /**
  * The Class Messages.
+ * @since 3.0
  */
 public class Messages extends NLS {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java
index 65ceca684d0..6b55939f818 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class ComponentReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java
index 1c7e0829d31..8611aeed9ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_1_0.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Component Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class ComponentReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_2_0.java
index 7539657361b..9ead7069dd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/migration/ComponentReconciler_1_2_0.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Component Diagram Reconciler from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class ComponentReconciler_1_2_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java
index 7b4f141d127..8eeac47b170 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;
  * resolving the semantic children of a Property (as viewed in a
  * structured classifier) in {@link UMLDiagramUpdater}.
  * </pre>
+ * @since 3.0
  */
 public class PropertyDiagramUpdater implements ICustomDiagramUpdater<UMLNodeDescriptor> {
 	/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusOperationPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusOperationPreferencesConstant.java
index bdfafa9f218..e1f58084637 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusOperationPreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusOperationPreferencesConstant.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.uml.diagram.component.custom.preferences;
 
 /**
  * Constants for {@link Operation} preferences.
+ * @since 3.0
  */
 public interface IPapyrusOperationPreferencesConstant {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
index 14a62655b9e..5267aab0b87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
@@ -19,6 +19,7 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Constants for {@link Property} preferences.
+ * @since 3.0
  */
 public interface IPapyrusPropertyPreferencesConstant {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomUMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomUMLParserProvider.java
index 901f88b312c..6d25ab3688d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomUMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/providers/CustomUMLParserProvider.java
@@ -18,6 +18,9 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionAppliedS
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageAppliedStereotypeEditPart;
 import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;
 
+/**
+ * @since 3.0
+ */
 public class CustomUMLParserProvider extends UMLParserProvider {
 
 	public CustomUMLParserProvider() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationUseFromTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationUseFromTypeCreateCommand.java
index 544d76b89d5..b5031edd5d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationUseFromTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/CollaborationUseFromTypeCreateCommand.java
@@ -42,6 +42,9 @@ public class CollaborationUseFromTypeCreateCommand extends EditElementCommand {
 
 	protected SemanticAdapter semanticAdapter;
 
+	/**
+	 * @since 3.0
+	 */
 	public CollaborationUseFromTypeCreateCommand(CreateElementRequest req, StructuredClassifier owner, Collaboration collaboration, SemanticAdapter semanticAdapter) {
 		super(req.getLabel(), null, req);
 		this.owner = owner;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java
index f3ec4ac4b93..b7d16ae0e79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/command/PropertyPartFromTypeCreateCommand.java
@@ -44,6 +44,9 @@ public class PropertyPartFromTypeCreateCommand extends EditElementCommand {
 
 	protected SemanticAdapter semanticAdapter;
 
+	/**
+	 * @since 3.0
+	 */
 	public PropertyPartFromTypeCreateCommand(CreateElementRequest req, StructuredClassifier owner, Type type, SemanticAdapter semanticAdapter) {
 		super(req.getLabel(), null, req);
 		this.owner = owner;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
index fc502328661..a23ca15a526 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/BehaviorPortLocator.java
@@ -28,6 +28,7 @@ public class BehaviorPortLocator extends PortPositionLocator {
 	 * Constructor.
 	 *
 	 * @param parentFigure
+	 * @since 3.0
 	 */
 	public BehaviorPortLocator(IFigure parentFigure) {
 		super(parentFigure);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
index 8e08432d6e4..ad77ea2f9ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/CustomPortPositionLocator.java
@@ -34,6 +34,9 @@ public class CustomPortPositionLocator extends PortPositionLocator {
 
 	protected RoundedBorderNamedElementEditPart portEditPart = null;
 	
+	/**
+	 * @since 3.0
+	 */
 	public CustomPortPositionLocator(IFigure parentFigure, RoundedBorderNamedElementEditPart childEditPart) {
 		super(parentFigure);
 		portEditPart = childEditPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
index f537ae84672..51837aa7018 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/ExternalPortPositionLocator.java
@@ -20,6 +20,9 @@ import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
 public class ExternalPortPositionLocator extends PortPositionLocator {
 
 	
+	/**
+	 * @since 3.0
+	 */
 	public ExternalPortPositionLocator(IFigure parentFigure) {
 		super(parentFigure);
 	}	
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
index 8b3b6fb8e39..bfb7d6be56a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/locators/InternalPortPositionLocator.java
@@ -20,6 +20,9 @@ import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
 
 public class InternalPortPositionLocator extends PortPositionLocator {
 
+	/**
+	 * @since 3.0
+	 */
 	public InternalPortPositionLocator(IFigure parentFigure) {
 		super(parentFigure);
 	}	
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java
index 6c3847e7852..19606b6f3ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class CompositeReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java
index d9b4e6e1bad..0e86d9d7977 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/migration/CompositeReconciler_1_1_0.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Composite Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class CompositeReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementAdapter.java
index 7c8527f6aa6..050276379e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementAdapter.java
@@ -28,6 +28,7 @@ import org.eclipse.uml2.uml.TypedElement;
  * Supports type applied stereotypes and stereotype properties
  *
  * @author Shuai Li
+ * @since 2.0
  *
  */
 public class GMFUMLTypedElementAdapter extends GMFUMLElementAdapter {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProvider.java
index 7b6bfd8d6bb..c9a9de441b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProvider.java
@@ -23,6 +23,7 @@ import org.w3c.dom.Element;
  * Provides a specialization of GMFElementAdapter for UML TypedElements
  *
  * @author Shuai Li
+ * @since 2.0
  */
 @SuppressWarnings("restriction")
 // e4 CSS
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProviderFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProviderFactory.java
index c80927468ca..e4de54c37b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProviderFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/src/org/eclipse/papyrus/uml/diagram/css/dom/GMFUMLTypedElementProviderFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.css.dom.GMFUMLElementProviderFactory;
  * IElementProvider Factory for Diagrams related to UML TypedElements
  *
  * @author Shuai Li
+ * @since 2.0
  *
  */
 public class GMFUMLTypedElementProviderFactory extends GMFUMLElementProviderFactory {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java
index 266390e3b41..30d61a7568b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class DeploymentReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java
index 5fd3e472d72..1534017a4bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_1_0.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Deployment Diagram Reconciler from 1.0.0 to 1.1.0
+ * @since 3.0
  */
 public class DeploymentReconciler_1_1_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_2_0.java
index cac27ff5692..ec049ffc20a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/migration/DeploymentReconciler_1_2_0.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Deployment Diagram Reconciler from 1.1.0 to 1.2.0
+ * @since 3.0
  */
 public class DeploymentReconciler_1_2_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java
index e1602585402..850c5507673 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/LifelineNodePlate.java
@@ -14,23 +14,21 @@
 package org.eclipse.papyrus.uml.diagram.sequence;
 
 import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PointList;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.LinkLFSVGNodePlateFigure;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
 
 /**
  * This figure is used in order to allow a link to follow the shape of the lifeLine
  * see getPolygonPoints()
+ * 
+ * @since 3.0
  *
  */
-public  class LifelineNodePlate extends LinkLFSVGNodePlateFigure {
+public class LifelineNodePlate extends LinkLFSVGNodePlateFigure {
 
 	/**
 	 * Constructor.
@@ -38,13 +36,14 @@ public  class LifelineNodePlate extends LinkLFSVGNodePlateFigure {
 	 * @param hostEP
 	 * @param width
 	 * @param height
-	 * @param lifelineEditPart TODO
+	 * @param lifelineEditPart
+	 *            TODO
 	 */
-	public	LifelineNodePlate(org.eclipse.gef.GraphicalEditPart hostEP, int width, int height) {
+	public LifelineNodePlate(org.eclipse.gef.GraphicalEditPart hostEP, int width, int height) {
 		super(hostEP, width, height);
 		withLinkLFEnabled();
-		followSVGPapyrusPath=true;
-		
+		followSVGPapyrusPath = true;
+
 	}
 
 	/**
@@ -52,7 +51,7 @@ public  class LifelineNodePlate extends LinkLFSVGNodePlateFigure {
 	 */
 	@Override
 	public PointList getPolygonPoints() {
-		return ((NodeFigure)this.getChildren().get(0)).getPolygonPoints();
+		return ((NodeFigure) this.getChildren().get(0)).getPolygonPoints();
 	}
 
 	protected ConnectionAnchor createAnchor(PrecisionPoint p) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java
index 6ee88b4d0cd..e8f81c553d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CCombinedFragmentCombinedFragmentCompartmentEditPart.java
@@ -13,15 +13,12 @@
 
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import java.util.Iterator;
-
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
@@ -31,6 +28,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.BoundForEdit
  * This class has been modified for 2 reasons:
  * - refresh in order to ensure the refresh about size of children
  * - compute the ratio for each children.
+ * 
+ * @since 3.0
  *
  */
 public class CCombinedFragmentCombinedFragmentCompartmentEditPart extends CombinedFragmentCombinedFragmentCompartmentEditPart {
@@ -56,32 +55,33 @@ public class CCombinedFragmentCombinedFragmentCompartmentEditPart extends Combin
 		Point loc = new Point(x, y);
 		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));
 
-		//this code has been added in order to force the refresh of Sub Combined fragment
-		if(children!=null){
+		// this code has been added in order to force the refresh of Sub Combined fragment
+		if (children != null) {
 			for (Object child : children) {
-				if( child instanceof EditPart){
-					((EditPart)child).refresh();
+				if (child instanceof EditPart) {
+					((EditPart) child).refresh();
 				}
 			}
 		}
 	}
-	
+
 	/**
 	 * This code is specific an use to constraint the size of sub compartments.
 	 * the ratio has to be recompute in order to have a good display
+	 * 
 	 * @see GraphicalEditPart#setLayoutConstraint(EditPart, IFigure, Object)
 	 */
 	public void setLayoutConstraint(EditPart child, IFigure childFigure,
 			Object childConstraint) {
-		EditPart parentEditPart=this.getParent();
-		//compute the ratio for each children
-		int parentHeight= BoundForEditPart.getHeightFromView((Node)parentEditPart.getModel());
-		if(childConstraint instanceof Rectangle){
-			double ratio= ((double)((Rectangle)childConstraint).height)/parentHeight;
-			if( ratio>=1.0){
-				ratio=0.95;
+		EditPart parentEditPart = this.getParent();
+		// compute the ratio for each children
+		int parentHeight = BoundForEditPart.getHeightFromView((Node) parentEditPart.getModel());
+		if (childConstraint instanceof Rectangle) {
+			double ratio = ((double) ((Rectangle) childConstraint).height) / parentHeight;
+			if (ratio >= 1.0) {
+				ratio = 0.95;
 			}
-			System.out.println("ratio"+ratio);
+			System.out.println("ratio" + ratio);
 			childFigure.getParent().setConstraint(childFigure, ratio);
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomGeneralOrderingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomGeneralOrderingEditPart.java
index 67f15ba1ae5..caaff0f43f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomGeneralOrderingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomGeneralOrderingEditPart.java
@@ -52,6 +52,9 @@ public class CustomGeneralOrderingEditPart extends GeneralOrderingEditPart imple
 		return new CustomGeneralOrderingDescriptor(getMapMode());
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	@Override
 	public CustomGeneralOrderingDescriptor getPrimaryShape() {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
index 18962ced9c4..9c52b6cc3b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageAsyncEditPart extends MessageAsyncEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
index eb6b4f51cf8..2cada898d61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageCreateEditPart extends MessageCreateEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
index 6dacce143b5..0a47eac78e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageDeleteEditPart extends MessageDeleteEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
index befe2ca3185..520a5ecdc7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageFoundEditPart extends MessageFoundEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
index 000b29592a0..a139895577a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageLostEditPart extends MessageLostEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
index d27e5c7fb18..f015a533f96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageReplyEditPart extends MessageReplyEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
index 2d2ef0d01f2..50525659ce6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
@@ -23,6 +23,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class CustomMessageSyncEditPart extends MessageSyncEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java
index e0f913ef789..798d226ecc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomStateInvariantEditPart.java
@@ -16,63 +16,36 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.OrderedLayout;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.ToolbarLayout;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.text.FlowPage;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.NotationFactory;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.utils.FigureUtils;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
 import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ExecutionSpecificationEndEditPart.DummyCommand;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.AppliedStereotypeCommentCreationEditPolicyEx;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.StateInvariantResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.ContinuationFigure;
 import org.eclipse.papyrus.uml.diagram.sequence.figures.StateInvariantFigure;
-import org.eclipse.papyrus.uml.diagram.sequence.locator.CenterLocator;
 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;
 import org.eclipse.papyrus.uml.diagram.sequence.util.NotificationHelper;
 import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies.AppliedStereotypeCommentEditPolicy;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.StateInvariant;
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -153,7 +126,7 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme
 		// install a editpolicy to display stereotypes
 		installEditPolicy(AppliedStereotypeCommentEditPolicy.APPLIED_STEREOTYPE_COMMENT, new AppliedStereotypeCommentCreationEditPolicyEx());
 		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		
+
 	}
 
 	@Override
@@ -178,7 +151,7 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme
 			}
 		}
 	}
-	
+
 	/**
 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart#getPrimaryDragEditPolicy()
 	 *
@@ -186,7 +159,7 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme
 	 */
 	@Override
 	public EditPolicy getPrimaryDragEditPolicy() {
-		
+
 		return new StateInvariantResizableEditPolicy();
 	}
 
@@ -319,6 +292,7 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme
 	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart#getPrimaryShape()
 	 *
 	 * @return
+	 * @since 3.0
 	 */
 	@Override
 	public StateInvariantFigure getPrimaryShape() {
@@ -365,5 +339,5 @@ public class CustomStateInvariantEditPart extends StateInvariantEditPart impleme
 	}
 
 
-	
+
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionInteractionCompartmentEditPart.java
index b7c3471a46f..ddf2f166818 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionInteractionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDCustomInteractionInteractionCompartmentEditPart.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.HighlightUtil;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class OLDCustomInteractionInteractionCompartmentEditPart extends InteractionInteractionCompartmentEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateNameEditPart.java
index fc9a70d1ccf..e2916cc6396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDGateNameEditPart.java
@@ -64,6 +64,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * 2. Add displaying stereotypes.
  *
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class OLDGateNameEditPart extends BorderItemLabelEditPart implements IPapyrusEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDPackageEditPart.java
index 2d67082ddad..0958c82c544 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDPackageEditPart.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class OLDPackageEditPart extends SequenceDiagramEditPart {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java
index b74bb8bd890..57b6ae3fabd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifeLineResizeAffixedNodeEditPolicy.java
@@ -19,7 +19,7 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AllowResizeAffixedNod
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.StateInvariantEditPart;
 
 /**
- * @author C�line JANSSENS
+ * @since 3.0
  *
  */
 public class LifeLineResizeAffixedNodeEditPolicy extends AllowResizeAffixedNodeAlignmentEditPolicy {
@@ -36,7 +36,7 @@ public class LifeLineResizeAffixedNodeEditPolicy extends AllowResizeAffixedNodeA
 			return new StateInvariantResizableEditPolicy();
 		}
 		return super.createChildEditPolicy(child);
-			
+
 	}
-	
+
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDCombinedFragmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDCombinedFragmentCreationEditPolicy.java
index 946d0271f90..2381579c223 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDCombinedFragmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDCombinedFragmentCreationEditPolicy.java
@@ -44,6 +44,7 @@ import org.eclipse.uml2.uml.InteractionFragment;
  * when creating a new combined fragment.
  *
  * @author mvelten
+ * @since 3.0
  *
  */
 public class OLDCombinedFragmentCreationEditPolicy extends DefaultCreationEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java
index c78ec6b4dc8..0ec2cecfdd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDDestructionEventComponentEditPolicy.java
@@ -23,6 +23,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;
 
 /**
  * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part.
+ * 
+ * @since 3.0
  */
 public class OLDDestructionEventComponentEditPolicy extends ComponentEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateCreationEditPolicy.java
index 5b08c96f10c..54cd03bf1ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateCreationEditPolicy.java
@@ -30,14 +30,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy;
 import org.eclipse.papyrus.uml.diagram.sequence.command.OLDCreateGateElementAndViewCommand;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.locator.GateLocator;
 import org.eclipse.papyrus.uml.diagram.sequence.util.GateHelper;
 import org.eclipse.swt.widgets.Control;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class OLDGateCreationEditPolicy extends LayoutEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java
index 4aa1295420d..24b4204f168 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGateGraphicalNodeEditPolicy.java
@@ -57,6 +57,7 @@ import org.eclipse.uml2.uml.MessageEnd;
 
 /**
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 @SuppressWarnings("unchecked")
 public class OLDGateGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java
index c77177b1f2c..0be27417e56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDGatesHolderGraphicalNodeEditPolicy.java
@@ -58,9 +58,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.sequence.command.OLDCreateGateElementAndViewCommand;
 import org.eclipse.papyrus.uml.diagram.sequence.command.ReconnectToGateCommand;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionUseEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.OLDGateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.locator.GateLocator;
 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
 import org.eclipse.papyrus.uml.diagram.sequence.util.GateHelper;
@@ -74,6 +74,7 @@ import org.eclipse.uml2.uml.Message;
  *
  * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=389531
  * @author Jin Liu (jin.liu@soyatec.com)
+ * @since 3.0
  */
 public class OLDGatesHolderGraphicalNodeEditPolicy extends OLDSequenceGraphicalNodeEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java
index 9d3444de84b..93832d3f0ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDMessageConnectionEditPolicy.java
@@ -24,6 +24,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceDeleteHelper;
 
 /**
  * This edit policy also deletes time/duration edit parts which are linked with the deleted edit part.
+ * 
+ * @since 3.0
  */
 public class OLDMessageConnectionEditPolicy extends ConnectionEditPolicy {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java
index 507ef73869b..709e34e4a06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomGeneralOrderingDescriptor.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 
 /**
- * @author C�line JANSSENS
+ * @since 3.0
  *
  */
 public class CustomGeneralOrderingDescriptor extends GeneralOrderingDescriptor implements IPapyrusUMLElementFigure {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java
index b05f8f1ff01..90faabb9d6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/ExecutionSpecificationNodePlate.java
@@ -15,18 +15,17 @@ package org.eclipse.papyrus.uml.diagram.sequence.figures;
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.LinkLFSVGNodePlateFigure;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper;
 
 /**
- * @author PT202707
+ * @since 3.0
  *
  */
 public class ExecutionSpecificationNodePlate extends LinkLFSVGNodePlateFigure implements ILifelineInternalFigure {
-		/**
+	/**
 	 * Constructor.
 	 *
 	 * @param hostEP
@@ -34,26 +33,26 @@ public class ExecutionSpecificationNodePlate extends LinkLFSVGNodePlateFigure im
 	 * @param height
 	 */
 	public ExecutionSpecificationNodePlate(GraphicalEditPart hostEP, int width, int height) {
-		super(hostEP, width,height);
+		super(hostEP, width, height);
 	}
 
-		/**
-		 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#isDefaultAnchorArea(org.eclipse.draw2d.geometry.PrecisionPoint)
-		 */
-		@Override
-		protected boolean isDefaultAnchorArea(PrecisionPoint p) {
-			return false;
-		}
+	/**
+	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#isDefaultAnchorArea(org.eclipse.draw2d.geometry.PrecisionPoint)
+	 */
+	@Override
+	protected boolean isDefaultAnchorArea(PrecisionPoint p) {
+		return false;
+	}
 
-		@Override
-		public ConnectionAnchor getConnectionAnchor(String terminal) {
-			// Use FixedAnchorEx for MessageSync, this will be invoked by mapConnectionAnchor(termial) operation.
-			if (terminal != null && terminal.indexOf("{") != -1 && terminal.indexOf("}") != -1) {
-				int position = AnchorHelper.FixedAnchorEx.parsePosition(terminal);
-				if (PositionConstants.TOP == position || PositionConstants.BOTTOM == position) {
-					return new AnchorHelper.FixedAnchorEx(this, position);
-				}
+	@Override
+	public ConnectionAnchor getConnectionAnchor(String terminal) {
+		// Use FixedAnchorEx for MessageSync, this will be invoked by mapConnectionAnchor(termial) operation.
+		if (terminal != null && terminal.indexOf("{") != -1 && terminal.indexOf("}") != -1) {
+			int position = AnchorHelper.FixedAnchorEx.parsePosition(terminal);
+			if (PositionConstants.TOP == position || PositionConstants.BOTTOM == position) {
+				return new AnchorHelper.FixedAnchorEx(this, position);
 			}
-			return super.getConnectionAnchor(terminal);
 		}
+		return super.getConnectionAnchor(terminal);
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFigure.java
index a525156695f..9b88805b1ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFigure.java
@@ -53,10 +53,10 @@ public abstract class MessageFigure extends UMLEdgeFigure {
 	public MessageFigure(IMapMode mapMode) {
 		this.mapMode = mapMode;
 		createContents();
-		if(createTargetDecoration()!=null){
+		if (createTargetDecoration() != null) {
 			setTargetDecoration(createTargetDecoration());
 		}
-		if(createSourceDecoration()!=null){
+		if (createSourceDecoration() != null) {
 			setSourceDecoration(createSourceDecoration());
 		}
 	}
@@ -64,10 +64,10 @@ public abstract class MessageFigure extends UMLEdgeFigure {
 	@Override
 	public void resetStyle() {
 		super.resetStyle();
-		if(createTargetDecoration()!=null){
+		if (createTargetDecoration() != null) {
 			setTargetDecoration(createTargetDecoration());
 		}
-		if(createSourceDecoration()!=null){
+		if (createSourceDecoration() != null) {
 			setSourceDecoration(createSourceDecoration());
 		}
 	}
@@ -97,6 +97,10 @@ public abstract class MessageFigure extends UMLEdgeFigure {
 	}
 
 	protected abstract RotatableDecoration createTargetDecoration();
+
+	/**
+	 * @since 3.0
+	 */
 	protected abstract RotatableDecoration createSourceDecoration();
 
 	@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java
index f4225b0ad6f..2430be702e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/StateInvariantFigure.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   C�line Jansens - Initial API and implementation
+ *   C�line Jansens - Initial API and implementation
  *   
  *****************************************************************************/
 
@@ -34,8 +34,9 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElement
 import org.eclipse.swt.graphics.Image;
 
 /**
- * @author C�line JANSSENS
  * Class extracted from the Custom State Invariant edit part
+ * 
+ * @since 3.0
  *
  */
 public class StateInvariantFigure extends ContinuationFigure implements ILabelFigure, IMultilineEditableFigure, IPapyrusNodeUMLElementFigure {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java
index ade2e278ee6..88ff997022f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/CustomViewProvider.java
@@ -50,7 +50,6 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationEd
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLabelEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionInteractionCompartmentEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandGuardEditPart;
-import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationAppliedStereotypeEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.TimeObservationLabelEditPart;
@@ -71,7 +70,7 @@ public class CustomViewProvider extends UMLViewProvider {
 			return false;
 		}
 		String visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());
-		if (DurationConstraintEditPart.VISUAL_ID.equals(visualID)) { 
+		if (DurationConstraintEditPart.VISUAL_ID.equals(visualID)) {
 			// avoid to
 			// modify
 			// UMLVisualIDRegistry.getNodeVisualID(View,
@@ -91,9 +90,9 @@ public class CustomViewProvider extends UMLViewProvider {
 		}
 		String visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());
 		if (DurationConstraintEditPart.VISUAL_ID.equals(visualID)) { // avoid to
-																// modify
-																// UMLVisualIDRegistry.getNodeVisualID(View,
-																// EObject)
+			// modify
+			// UMLVisualIDRegistry.getNodeVisualID(View,
+			// EObject)
 			if (InteractionInteractionCompartmentEditPart.VISUAL_ID.equals(UMLVisualIDRegistry
 					.getVisualID(op.getContainerView()))) {
 				return true;
@@ -139,7 +138,8 @@ public class CustomViewProvider extends UMLViewProvider {
 				prefStore, "TimeObservation");
 		Node timeObservation_NameLabel = createLabel(node,
 				UMLVisualIDRegistry
-						.getType(TimeObservationLabelEditPart.VISUAL_ID), true);
+						.getType(TimeObservationLabelEditPart.VISUAL_ID),
+				true);
 		timeObservation_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE
 				.createLocation());
 		Location timeObservation_NameLabel_Location = (Location) timeObservation_NameLabel.getLayoutConstraint();
@@ -207,12 +207,13 @@ public class CustomViewProvider extends UMLViewProvider {
 	}
 
 	/**
-	 *  This class has bee overloaded in order to set the combined fragment under the lifelines 
+	 * This class has bee overloaded in order to set the combined fragment under the lifelines
+	 * 
 	 * @see org.eclipse.papyrus.uml.diagram.sequence.providers.UMLViewProvider#createCombinedFragment_Shape(org.eclipse.emf.ecore.EObject, org.eclipse.gmf.runtime.notation.View, int, boolean, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
 	 */
 	@Override
 	public Node createCombinedFragment_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		int position=LifelinePosition(containerView);
+		int position = LifelinePosition(containerView);
 		Shape node = NotationFactory.eINSTANCE.createShape();
 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
 		node.setType(UMLVisualIDRegistry.getType(CombinedFragmentEditPart.VISUAL_ID));
@@ -224,36 +225,40 @@ public class CustomViewProvider extends UMLViewProvider {
 		PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "CombinedFragment");
 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CombinedFragment");
 		PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "CombinedFragment");
-		Node compartment = createCompartment(node,UMLVisualIDRegistry.getType(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID),
+		Node compartment = createCompartment(node, UMLVisualIDRegistry.getType(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID),
 				false, false, true, true);
 		// Add by default InteractionOperand
-//		for (InteractionOperand interactionOperand : ((CombinedFragment) domainElement).getOperands()) {
-//			createInteractionOperand_Shape(interactionOperand, compartment, -1,	true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-//		}
+		// for (InteractionOperand interactionOperand : ((CombinedFragment) domainElement).getOperands()) {
+		// createInteractionOperand_Shape(interactionOperand, compartment, -1, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+		// }
 		// initialization for the compartment visibility
 		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(
 				node, prefStore, "CombinedFragment");
 		return node;
 	}
+
 	/**
-	 * @param containerView the view that can contains lifeline representation 	
-	 *  @return the position of the first lifeline in the notation
+	 * @param containerView
+	 *            the view that can contains lifeline representation
+	 * @return the position of the first lifeline in the notation
+	 * @since 3.0
 	 * 
 	 */
-	protected int LifelinePosition(View containerView){
+	protected int LifelinePosition(View containerView) {
 		@SuppressWarnings("unchecked")
-		List<Object> children= containerView.getChildren();
-		int i=0;
-		while (i<children.size()){
-			if(children.get(i) instanceof View){
-				if( ((View)children.get(i)).getElement() instanceof Lifeline){
-				return i;}
+		List<Object> children = containerView.getChildren();
+		int i = 0;
+		while (i < children.size()) {
+			if (children.get(i) instanceof View) {
+				if (((View) children.get(i)).getElement() instanceof Lifeline) {
+					return i;
+				}
 			}
 			i++;
 		}
 		return i;
 	}
-	
+
 
 	@Override
 	public Node createDurationConstraint_Shape_CN(EObject domainElement,
@@ -420,9 +425,8 @@ public class CustomViewProvider extends UMLViewProvider {
 	public Node createBehaviorExecutionSpecification_Shape(
 			EObject domainElement, View containerView, int index,
 			boolean persisted, PreferencesHint preferencesHint) {
-		Node node = super
-				.createBehaviorExecutionSpecification_Shape(domainElement,
-						containerView, index, persisted, preferencesHint);
+		Node node = super.createBehaviorExecutionSpecification_Shape(domainElement,
+				containerView, index, persisted, preferencesHint);
 		// Add a label for Behavior.
 		Node label = createLabel(node,
 				BehaviorExecutionSpecificationBehaviorEditPart.BEHAVIOR_TYPE);
@@ -432,7 +436,7 @@ public class CustomViewProvider extends UMLViewProvider {
 		label.setLayoutConstraint(location);
 		return node;
 	}
-	
-	
+
+
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
index 1260f436a67..5a06ac13c7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateCreationEditPolicy.java
@@ -143,6 +143,9 @@ public class CustomStateCreationEditPolicy extends SideAffixedNodesCreationEditP
 
 		IElementType elementType;
 
+		/**
+		 * @since 3.0
+		 */
 		public CustomVertexCreateElementCommand(TransactionalEditingDomain domain, ViewDescriptor viewDescriptor, IElementType elementType, IAdaptable adaptable, String label) {
 			super(domain, label, null);
 			this.adaptable = adaptable;
@@ -152,6 +155,9 @@ public class CustomStateCreationEditPolicy extends SideAffixedNodesCreationEditP
 			setResult(CommandResult.newOKCommandResult(viewDescriptor));
 		}
 
+		/**
+		 * @since 3.0
+		 */
 		@Override
 		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 			// adapt the view at execution time
@@ -183,6 +189,9 @@ public class CustomStateCreationEditPolicy extends SideAffixedNodesCreationEditP
 		}
 	}
 
+	/**
+	 * @since 3.0
+	 */
 	public Command getCustomCreateCommand(Request request, CreateRequest createReq, IElementType elementType, String semanticHint) {
 		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
 		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/TimingDiagramLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/TimingDiagramLinkMappingHelper.java
index 1f65226a3bc..f84645abe2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/TimingDiagramLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/TimingDiagramLinkMappingHelper.java
@@ -18,6 +18,7 @@ import org.eclipse.uml2.uml.Element;
 
 /**
  * Specialization of the link mapping helper for the timing diagram
+ * @since 1.3
  */
 public class TimingDiagramLinkMappingHelper implements ILinkMappingHelper {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/DefaultTypeHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/DefaultTypeHelperAdvice.java
index 050addbd316..9605ea79f87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/DefaultTypeHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/DefaultTypeHelperAdvice.java
@@ -17,7 +17,8 @@ import org.eclipse.papyrus.uml.diagram.timing.custom.utils.ViewUtils;
 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.FullStateInvariantVerticalLineEditPart;
 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;
 
-/** This HelperAdvice disapproves destroy requests for VerticalLines. */
+/** This HelperAdvice disapproves destroy requests for VerticalLines. 
+ * @since 1.3*/
 public class DefaultTypeHelperAdvice extends AbstractEditHelperAdvice {
 
 	private static String VERTICAL_LINE_ID = FullStateInvariantVerticalLineEditPart.VISUAL_ID;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/GateHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/GateHelperAdvice.java
index 35064e4851a..278d56e6598 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/GateHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/GateHelperAdvice.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.Gate;
 /**
  * This HelperAdvice completes {@link Gate} edit commands with commands specific to the timing diagram in order to keep
  * the model consistent when deleting a {@link Gate}.
+ * @since 1.3
  */
 public class GateHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/OccurrenceSpecificationHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/OccurrenceSpecificationHelperAdvice.java
index 7c4ba3281b6..3bb5c84d88f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/OccurrenceSpecificationHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/OccurrenceSpecificationHelperAdvice.java
@@ -26,6 +26,7 @@ import org.eclipse.uml2.uml.OccurrenceSpecification;
 /**
  * This HelperAdvice completes {@link OccurrenceSpecification} edit commands with commands specific to the timing
  * diagram in order to keep the model and diagram consistent when deleting an {@link OccurrenceSpecification}.
+ * @since 1.3
  */
 public class OccurrenceSpecificationHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java
index 19dcf315b4d..bab240f8d44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateDefinitionHelperAdvice.java
@@ -1,46 +1,47 @@
-/*****************************************************************************
- * Copyright (c) 2016 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.uml.diagram.timing.custom.helper.advice;
-
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-
-/** This advice does nothing because the actual semantic command are done somewhere else. */
-public class StateDefinitionHelperAdvice extends AbstractEditHelperAdvice {
-
-	@Override
-	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {
-
-		GetEditContextCommand command = new GetEditContextCommand(request);
-		command.setEditContext(request.getEditHelperContext());
-		return command;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)
-	 *
-	 * @param request
-	 * @return
-	 */
-	@Override
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		return IdentityCommand.INSTANCE;
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2016 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.uml.diagram.timing.custom.helper.advice;
+
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.GetEditContextCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
+
+/** This advice does nothing because the actual semantic command are done somewhere else. 
+ * @since 1.3*/
+public class StateDefinitionHelperAdvice extends AbstractEditHelperAdvice {
+
+	@Override
+	protected ICommand getBeforeEditContextCommand(final GetEditContextRequest request) {
+
+		GetEditContextCommand command = new GetEditContextCommand(request);
+		command.setEditContext(request.getEditHelperContext());
+		return command;
+	}
+
+	/**
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
+		return IdentityCommand.INSTANCE;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateInvariantHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateInvariantHelperAdvice.java
index 62bf11b0b54..c0bb407b30c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateInvariantHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/helper/advice/StateInvariantHelperAdvice.java
@@ -28,6 +28,7 @@ import org.eclipse.uml2.uml.StateInvariant;
 /**
  * This HelperAdvice completes {@link StateInvariant} edit commands with commands specific to the timing diagram in
  * order to keep the model and diagram consistent when deleting a {@link StateInvariant}.
+ * @since 1.3
  */
 public class StateInvariantHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/locator/LabelInCompartmentLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/locator/LabelInCompartmentLocator.java
index 9a70441901c..50f83c9acd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/locator/LabelInCompartmentLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/locator/LabelInCompartmentLocator.java
@@ -16,6 +16,7 @@ import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocat
 /**
  * Lets the user move a Label anywhere inside its containing compartment, but don't let the label stick out of the
  * compartment.
+ * @since 1.3
  */
 public class LabelInCompartmentLocator extends ExternalLabelPositionLocator {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java
index 031fa565d6d..cb0933c3c16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconcilerForCompartment_1_2_0.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm
 
 /**
  * Diagram Reconciler for compartment from 1.1.0 to 1.2.0
+ * @since 1.3
  */
 public class TimingReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconciler_1_2_0.java
index 94f4ff749ee..b37c3e517eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconciler_1_2_0.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/migration/TimingReconciler_1_2_0.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler;
 
 /**
  * Timing Diagram Reconciler from 1.1.0 to 1.2.0
+ * @since 1.3
  */
 public class TimingReconciler_1_2_0 extends DiagramReconciler {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java
index 9771247f34e..4032cb5acf7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/kind/RepresentationKindContentProvider.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
 /**
  * The ContentProvider for DiagramCategory table.
  * Returns available diagram kinds for the given diagram category(ies).
+ * @since 3.0
  */
 public class RepresentationKindContentProvider implements IStructuredContentProvider {
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
index 08c380636be..ac035ea25e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
@@ -59,11 +59,19 @@ public class Messages extends NLS {
 	/** The Diagram category registry_bad_class_name_of_category. */
 	public static String DiagramCategoryRegistry_bad_class_name_of_category;
 
-
+	/**
+	 * @since 3.0
+	 */
 	public static String RepresentationKindComposite_0;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String RepresentationKindComposite_2;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String RepresentationKindComposite_3;
 
 	/** The Diagram kind label provider_undefined_element. */
@@ -96,64 +104,111 @@ public class Messages extends NLS {
 	public static String NewModelFilePage_set_a_container;
 
 
-	/** The Select diagram category page_cannot_find_category. */
+	/** The Select diagram category page_cannot_find_category. 
+	 * @since 3.0*/
 	public static String SelectArchitectureContextPage_cannot_find_category;
 
-	/** The Select diagram category page_diagram_language_group. */
+	/** The Select diagram category page_diagram_language_group. 
+	 * @since 3.0*/
 	public static String SelectArchitectureContextPage_diagram_language_group;
 
-	/** The Select diagram category page_select_language. */
+	/** The Select diagram category page_select_language. 
+	 * @since 3.0*/
 	public static String SelectArchitectureContextPage_select_language;
 
-	/** The Select diagram category page_select_one_category. */
+	/** The Select diagram category page_select_one_category. 
+	 * @since 3.0*/
 	public static String SelectArchitectureContextPage_select_one_category;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String SelectRepresentationKindPage_0;
 
-	/** The Select diagram kind page_default_diagram_name. */
+	/** The Select diagram kind page_default_diagram_name. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_default_diagram_name;
 
-	/** The Select diagram kind page_diagram_name_group. */
+	/** The Select diagram kind page_diagram_name_group. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_diagram_name_group;
 
-	/** The Select diagram kind page_diagram_name_is_empty. */
+	/** The Select diagram kind page_diagram_name_is_empty. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_diagram_name_is_empty;
 
-	/** The Select diagram kind page_load_template_group. */
+	/** The Select diagram kind page_load_template_group. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_load_template_group;
 
-	/** The Select diagram kind page_page_desc. */
+	/** The Select diagram kind page_page_desc. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_page_desc;
 
-	/** The Select diagram kind page_page_title. */
+	/** The Select diagram kind page_page_title. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_page_title;
 
-	/** The Select diagram kind page_remember_current_selection_text. */
+	/** The Select diagram kind page_remember_current_selection_text. 
+	 * @since 3.0*/
 	public static String SelectRepresentationKindPage_remember_current_selection_text;
 
 	/** The Select diagram kind page_remember_current_selection_tooltip. */
+	/**
+	 * @since 3.0
+	 */
 	public static String SelectRepresentationKindPage_remember_current_selection_tooltip;
 
 	/** The Select diagram kind page_select_kind_group. */
+	/**
+	 * @since 3.0
+	 */
 	public static String SelectRepresentationKindPage_select_kind_group;
-
+	
+	/**
+	 * @since 3.0
+	 */
 	public static String SelectRepresentationKindPage_Set_Root_Name_Error;
 
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_RegisteredProfilesDialog;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_WorkspaceSelectionButton;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_RegisteredSelectionButton;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_ProfileStatus_UnavailableResource;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_ProfileStatus_EmptyResource;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_ProfileStatus_NotAProfile;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_ProfileStatus_NullResource;
 
+	/**
+	 * @since 3.0
+	 */
 	public static String ProfileChooserComposite_ProfileStatus_ProfileNotDefined;
 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
index c0784feb83a..322c3ecc9ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/utils/SettingsHelper.java
@@ -37,6 +37,7 @@ public class SettingsHelper {
 	 * Gets the saved architecture contexts.
 	 *
 	 * @return the saved architecture contexts
+	 * @since 3.0
 	 */
 	public String[] getArchitectureContexts() {
 		String[] contexts = mySettings.getArray(ARCHITECTURE_CONTEXTS);
@@ -48,6 +49,7 @@ public class SettingsHelper {
 	 *
 	 * @param contexts
 	 *            the architecture contexts
+	 * @since 3.0
 	 */
 	public void saveArchitectureContexts(String[] contexts) {
 		mySettings.put(ARCHITECTURE_CONTEXTS, contexts);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
index 1c68633207b..15981bc0602 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
@@ -115,7 +115,11 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	/** Select kind of new diagram the wizard must create. */
 	private SelectRepresentationKindPage selectRepresentationKindPage;
 
-	/** The select architecture context page. */
+	/**
+	 * The select architecture context page.
+	 * 
+	 * @since 3.0
+	 */
 	protected SelectArchitectureContextPage selectArchitectureContextPage;
 
 	/** Current workbench. */
@@ -284,8 +288,9 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * @param contextId
 	 *            the architecture context id
 	 * @param viewpointIds
-	 * 			  the architecture viewpoint ids
+	 *            the architecture viewpoint ids
 	 * @return true, if successful
+	 * @since 3.0
 	 */
 	protected boolean createAndOpenPapyrusModel(URI newURI, String contextId, String[] viewpointIds) {
 
@@ -389,6 +394,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * Gets the selected context ids.
 	 *
 	 * @return the context ids
+	 * @since 3.0
 	 */
 	protected String[] getSelectedContexts() {
 		SelectArchitectureContextPage page = getSelectArchitectureContextPage();
@@ -402,6 +408,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * Gets the viewpoint ids.
 	 *
 	 * @return the viewpoint ids
+	 * @since 3.0
 	 */
 	protected String[] getSelectedViewpoints() {
 		SelectArchitectureContextPage page = getSelectArchitectureContextPage();
@@ -415,6 +422,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * Gets the viewpoint ids.
 	 *
 	 * @return the viewpoint ids
+	 * @since 3.0
 	 */
 	protected String[] getSelectedViewpoints(String contextId) {
 		ArchitectureDomainManager manager = ArchitectureDomainManager.getInstance();
@@ -427,7 +435,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 		selectedViewpoints.retainAll(availableViewpoints);
 		return selectedViewpoints.toArray(new String[0]);
 	}
-	
+
 	private SelectArchitectureContextPage getSelectArchitectureContextPage() {
 		return (selectArchitectureContextPage != null)
 				? selectArchitectureContextPage
@@ -466,6 +474,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * Creates the select architecture context page.
 	 *
 	 * @return the select architecture context page
+	 * @since 3.0
 	 */
 	protected SelectArchitectureContextPage createSelectArchitectureContextPage() {
 		return new SelectArchitectureContextPage();
@@ -475,6 +484,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * Creates the select representation kind page.
 	 *
 	 * @return the select representation kind page
+	 * @since 3.0
 	 */
 	protected SelectRepresentationKindPage createSelectRepresentationKindPage() {
 		return new SelectRepresentationKindPage(new ContextProvider() {
@@ -501,6 +511,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 *            the architecture context id
 	 * @param viewpointIds
 	 *            the architecture viewpoint ids
+	 * @since 3.0
 	 */
 	protected void initDomainModel(ModelSet modelSet, String contextId, String[] viewpointIds) {
 
@@ -577,8 +588,9 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 */
 	protected void initDomainModelFromTemplate(ModelSet modelSet) {
 		getCommandStack(modelSet).execute(
-				new InitFromTemplateCommand(modelSet.getTransactionalEditingDomain(), modelSet, selectRepresentationKindPage.getTemplatePluginId(), selectRepresentationKindPage.getTemplatePath(), selectRepresentationKindPage.getNotationTemplatePath(), selectRepresentationKindPage
-						.getDiTemplatePath()));
+				new InitFromTemplateCommand(modelSet.getTransactionalEditingDomain(), modelSet, selectRepresentationKindPage.getTemplatePluginId(), selectRepresentationKindPage.getTemplatePath(), selectRepresentationKindPage.getNotationTemplatePath(),
+						selectRepresentationKindPage
+								.getDiTemplatePath()));
 	}
 
 	/**
@@ -590,6 +602,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 *            the architecture context id
 	 * @param viewpointIds
 	 *            the architecture viewpoint ids
+	 * @since 3.0
 	 */
 	protected void createEmptyDomainModel(ModelSet modelSet, String contextId, String[] viewpointIds) {
 		try {
@@ -731,7 +744,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 			for (int i = 0; i < creationCommands.size(); i++) {
 				RepresentationKind kind = creationCommands.get(i);
 				if (kind instanceof PapyrusRepresentationKind) {
-					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind)kind);
+					ViewPrototype proto = ViewPrototype.get((PapyrusRepresentationKind) kind);
 					proto.instantiateOn(root, diagramName.get(i));
 				}
 			}
@@ -744,6 +757,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * @param contextId
 	 *            the architecture context id
 	 * @return the repersentation kinds for
+	 * @since 3.0
 	 */
 	protected List<RepresentationKind> getRepresentationKindsFor(String contextId) {
 		return selectRepresentationKindPage.getSelectedRepresentationKinds(contextId);
@@ -788,6 +802,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 * @param newCategories
 	 *            the new categories
 	 * @return the i status
+	 * @since 3.0
 	 */
 	public IStatus architectureContextChanged(String... newContexts) {
 		return getSelectedStorageProvider().validateArchitectureContexts(newContexts);
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CustomizeUMLLabelHandler.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CustomizeUMLLabelHandler.java
index 9b1a63d1fec..40c5d5c2250 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CustomizeUMLLabelHandler.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/CustomizeUMLLabelHandler.java
@@ -31,6 +31,7 @@ import org.eclipse.ui.navigator.CommonNavigator;
 
 /**
  * Than handler to display dialog to customize UML Label.
+ * @since 2.0
  */
 public class CustomizeUMLLabelHandler extends AbstractHandler {
 
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UMLLabelCustomizableTester.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UMLLabelCustomizableTester.java
index 656d27514f6..1ec5306734f 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UMLLabelCustomizableTester.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/handler/UMLLabelCustomizableTester.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.views.modelexplorer.Activator;
 
 /**
  * A tester use to test if the CustomizableUMLLabel facet model is loaded.
+ * @since 2.0
  */
 public class UMLLabelCustomizableTester extends PropertyTester {
 
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferenceInitializer.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferenceInitializer.java
index 8577768af79..bcb74fbe86a 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferenceInitializer.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferenceInitializer.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.uml.tools.profile.definition.LabelTypesEnum;
 
 /**
  * Initializer for UML label customization preferences in Model Explorer.
+ * @since 2.0
  */
 public class CustomizableLabelPreferenceInitializer extends AbstractPreferenceInitializer {
 
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferences.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferences.java
index 113c69f3fdd..6d3d87be409 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferences.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/CustomizableLabelPreferences.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.uml.modelexplorer.preferences;
 
 /**
  * The CustomizableLabel Preferences keys.
+ * @since 2.0
  */
 public interface CustomizableLabelPreferences {
 
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/NamedElementDirectEditorPreferenceInitializer.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/NamedElementDirectEditorPreferenceInitializer.java
index d40e7922f04..7cfb39f593b 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/NamedElementDirectEditorPreferenceInitializer.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/preferences/NamedElementDirectEditorPreferenceInitializer.java
@@ -21,6 +21,7 @@ import org.eclipse.uml2.uml.NamedElement;
 /**
  * 
  * This preference initializer initializes the preferences for the direct editor of NamedElement.
+ * @since 2.0
  *
  */
 public class NamedElementDirectEditorPreferenceInitializer extends AbstractPreferenceInitializer {
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetComplexStyledName.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetComplexStyledName.java
index f7110320423..fc28c4f4494 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetComplexStyledName.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetComplexStyledName.java
@@ -31,6 +31,7 @@ import org.eclipse.uml2.uml.Element;
 
 /**
  * A query to get the Name as StyledString. The label is styled with preferences.
+ * @since 2.0
  */
 public class GetComplexStyledName implements IJavaQuery2<Element, StyledString> {
 
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
index ab11c3726cf..fe9bd2392c3 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
@@ -35,6 +35,7 @@ import org.eclipse.uml2.uml.Stereotype;
 
 /**
  * The cell editor for the DataType with a dialog.
+ * @since 3.0
  */
 public class DatatypeDialogCellEditor extends AbstractUMLMultiValueCellEditor {
 
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/editor/UMLReferenceTextWithCompletionCellEditor.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/editor/UMLReferenceTextWithCompletionCellEditor.java
index 957b7725680..0a96184febf 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/editor/UMLReferenceTextWithCompletionCellEditor.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/editor/UMLReferenceTextWithCompletionCellEditor.java
@@ -86,6 +86,7 @@ public class UMLReferenceTextWithCompletionCellEditor extends AbstractPapyrusSty
 	/**
 	 * The cell editor which allow to use the dialog reference selection.
 	 * It must be used when the text completion can't reach the value.
+	 * @since 3.0
 	 */
 	protected AbstractDialogCellEditor referenceValueCellEditor;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/RenameNamedElementLabelCommand.java b/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/RenameNamedElementLabelCommand.java
index 4fc978e26e4..f753a7a9195 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/RenameNamedElementLabelCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/RenameNamedElementLabelCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.uml2.uml.NamedElement;
 
 /**
  * Command to rename a label of a {@link NamedElement}.
+ * @since 1.3
  */
 public class RenameNamedElementLabelCommand extends RenameLabelCommand {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
index 3ae128f0806..653ec3c3daf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties
 src.includes = about.html
-additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/index/ProfileWorkspaceModelIndex.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/index/ProfileWorkspaceModelIndex.java
index 8b1f9bda1ef..78e3d7163e7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/index/ProfileWorkspaceModelIndex.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/index/ProfileWorkspaceModelIndex.java
@@ -28,6 +28,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * {@link WorkspaceModelIndex} for {@link Profile} model.
+ * @since 3.0
  *
  */
 public class ProfileWorkspaceModelIndex {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
index c5c09645229..b77575ad6f0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
@@ -1,1603 +1,1604 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 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
- *  Christian W. Damus (CEA LIST) - Fix leaking of all UML models in search results
- *  Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility
- *  Christian W. Damus (CEA) - bug 434681
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.search.ui.pages;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ICheckStateProvider;
-import org.eclipse.jface.viewers.ICheckable;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ocl.examples.xtext.console.xtfo.EmbeddedXtextEditor;
-import org.eclipse.ocl.pivot.ExpressionInOCL;
-import org.eclipse.ocl.pivot.internal.context.EObjectContext;
-import org.eclipse.ocl.pivot.resource.CSResource;
-import org.eclipse.ocl.pivot.utilities.EnvironmentFactory;
-import org.eclipse.ocl.pivot.utilities.ParserContext;
-import org.eclipse.ocl.pivot.utilities.ParserException;
-import org.eclipse.ocl.pivot.utilities.PivotUtil;
-import org.eclipse.ocl.pivot.values.InvalidValueException;
-import org.eclipse.ocl.pivot.values.Value;
-import org.eclipse.ocl.xtext.base.ui.model.BaseDocument;
-import org.eclipse.ocl.xtext.essentialocl.ui.internal.EssentialOCLActivator;
-import org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLCSResource;
-import org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLPlugin;
-import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
-import org.eclipse.papyrus.uml.search.ui.Activator;
-import org.eclipse.papyrus.uml.search.ui.CheckBoxFilteredTree;
-import org.eclipse.papyrus.uml.search.ui.Messages;
-import org.eclipse.papyrus.uml.search.ui.actions.ReplaceAction;
-import org.eclipse.papyrus.uml.search.ui.listeners.ParticipantTypesTreeViewerCheckStateListener;
-import org.eclipse.papyrus.uml.search.ui.providers.OCLContextContentProvider;
-import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeAttribute;
-import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeContentProvider;
-import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeElement;
-import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeLabelProvider;
-import org.eclipse.papyrus.uml.search.ui.query.AbstractPapyrusQuery;
-import org.eclipse.papyrus.uml.search.ui.query.CompositePapyrusQuery;
-import org.eclipse.papyrus.uml.search.ui.query.CompositePapyrusQueryProvider;
-import org.eclipse.papyrus.uml.search.ui.query.PapyrusOCLQuery;
-import org.eclipse.papyrus.uml.search.ui.query.QueryInfo;
-import org.eclipse.papyrus.uml.search.ui.query.WorkspaceQueryProvider;
-import org.eclipse.papyrus.uml.stereotypecollector.StereotypeCollector;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.views.search.regex.PatternHelper;
-import org.eclipse.papyrus.views.search.scope.ScopeCollector;
-import org.eclipse.papyrus.views.search.scope.ScopeEntry;
-import org.eclipse.search.ui.IReplacePage;
-import org.eclipse.search.ui.ISearchPage;
-import org.eclipse.search.ui.ISearchPageContainer;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResultPage;
-import org.eclipse.search.ui.ISearchResultViewPart;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.VerifyKeyListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.outline.IOutlineNode;
-import org.eclipse.xtext.ui.editor.outline.impl.EObjectNode;
-import org.eclipse.xtext.ui.editor.outline.impl.EStructuralFeatureNode;
-import org.eclipse.xtext.util.concurrent.IUnitOfWork;
-
-import com.google.inject.Injector;
-
-/**
- *
- * Papyrus specific search page
- *
- */
-public class PapyrusSearchPage extends DialogPage implements ISearchPage, IReplacePage {
-	
-	private int currentScope = -1;
-
-	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> umlTypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
-
-	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> stereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
-	
-	private LinkedList<Object> profiles = new LinkedList<Object>();
-	
-	private String allProfiles = "*";
-	
-	private Collection<Stereotype> availableStereotypes;
-	
-	private Collection<Stereotype> appliedStereotypes;
-	
-	private boolean profilesComputed = false;
-	
-	private boolean availableStereotypesComputed = false;
-	
-	private boolean appliedStereotypesComputed = false;
-
-	private static final String REGULAR_EXPRESSION_ILLFORMED = Messages.PapyrusSearchPage_0;
-
-	private static final String OCL_QUERY_ILLFORMED = Messages.PapyrusSearchPage_0;
-
-	private static final String SEARCH_ISSUE = Messages.PapyrusSearchPage_1;
-
-	private Text searchQueryText;
-
-	private Text oclContext;
-
-	private ISearchPageContainer container;
-
-	private CheckBoxFilteredTree participantUMLTypesTree;
-
-	private CheckBoxFilteredTree participantStereotypesTree;
-	
-	private CheckboxTreeViewer participantUMLTypesTreeViewer;
-	
-	private CheckboxTreeViewer participantStereotypesTreeViewer;
-	
-	private ComboViewer participantProfilesComboViewer;
-
-	private Label searchQueryExplanatoryLabel;
-
-	private Button btnRegularExpression;
-
-	private Button btnCaseSensitive;
-
-	private Button btnSearchAllStringAttributes;
-
-	private Button btnSearchInName;
-
-	private Combo queryKind;
-
-	private Combo searchKind;
-
-	private EmbeddedXtextEditor oclEditor;
-
-	private Composite queryComposite;
-
-	private EObject contextObject;
-
-	private static final int TEXT_QUERY_KIND = 0;
-	
-	private static final int OCL_QUERY_KIND = 1;
-
-	private static final int SIMPLE_SEARCH = 0;
-
-	private static final int ADVANCED_SEARCH = 1;
-	
-	private int currentSearchKind = SIMPLE_SEARCH;
-	
-	private int currentQueryKind = TEXT_QUERY_KIND;
-	
-	private boolean onlyAppliedStereotypes = false;
-	
-	private boolean onlyAppliedStereotypesStateChanged = true;
-	
-	private Profile selectedProfile = null;
-
-	private ParserContext parserContext;
-
-//	private ModelManager modelManager = null;
-
-	protected Composite textQueryComposite;
-
-	private Composite advancedSearchComposite;
-
-	private Composite textQueryFieldsComposite;
-	
-	private Button fBtnOnlyAppliedStereotypes;
-	
-	private Button fBtnSearchForAllSelected;
-	
-	private Button fBtnSearchForAnySelected;
-
-	private Label umlTypesLabel;
-	
-	private Label stereotypesLabel;
-	
-	private Label profilesLabel;
-	
-	private Label emptyLabel;
-
-	protected void createTextSearch() {
-		textQueryComposite = new Composite(queryComposite, SWT.NONE);
-		textQueryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-		textQueryComposite.setLayout(new GridLayout(2, false));
-
-		textQueryFieldsComposite = new Composite(textQueryComposite, SWT.NONE);
-		textQueryFieldsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
-		textQueryFieldsComposite.setLayout(new GridLayout(1, false));
-
-		searchQueryExplanatoryLabel = new Label(textQueryFieldsComposite, SWT.NONE);
-		searchQueryExplanatoryLabel.setText(Messages.PapyrusSearchPage_48);
-		searchQueryExplanatoryLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		
-		searchQueryText = new Text(textQueryFieldsComposite, SWT.BORDER);
-		searchQueryText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		searchQueryText.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent evt) {
-				validateRegex();
-			}
-		});
-		searchQueryText.setFocus();
-
-		Composite compositeParameters = new Composite(textQueryComposite, SWT.NONE);
-		compositeParameters.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		compositeParameters.setLayout(new GridLayout(1, false));
-
-		btnCaseSensitive = new Button(compositeParameters, SWT.CHECK);
-		btnCaseSensitive.setText(Messages.PapyrusSearchPage_5);
-
-		btnRegularExpression = new Button(compositeParameters, SWT.CHECK);
-		btnRegularExpression.setText(Messages.PapyrusSearchPage_6);
-		btnRegularExpression.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				btnCaseSensitive.setEnabled(!btnRegularExpression.getSelection());
-				validateRegex();
-				searchQueryText.forceFocus();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		Group grpSearchFor = new Group(textQueryComposite, SWT.NONE);
-		grpSearchFor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		grpSearchFor.setLayout(new GridLayout(1, false));
-		grpSearchFor.setText(Messages.PapyrusSearchPage_8);
-
-		Composite groupComposite = new Composite(grpSearchFor, SWT.NONE);
-		groupComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-		groupComposite.setLayout(new GridLayout(2, false));
-
-		Label lblSearchKind = new Label(groupComposite, SWT.NONE);
-		lblSearchKind.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
-		lblSearchKind.setText(Messages.PapyrusSearchPage_7);
-
-		searchKind = new Combo(groupComposite, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
-		searchKind.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
-		searchKind.add(Messages.PapyrusSearchPage_11);
-		searchKind.add(Messages.PapyrusSearchPage_12);
-		searchKind.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (searchKind.getSelectionIndex() != currentSearchKind) {
-					for (Control childControl : advancedSearchComposite.getChildren()) {
-						childControl.dispose();
-					}
-				
-					createSpecificTextSearch();
-					
-					advancedSearchComposite.layout();
-				}
-			}
-		});
-
-		advancedSearchComposite = new Composite(groupComposite, SWT.NONE);
-		// gd_advancedSearchComposite.widthHint = 479;
-		advancedSearchComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		advancedSearchComposite.setLayout(new GridLayout(3, false));
-
-		if (currentSearchKind == ADVANCED_SEARCH) {
-			searchKind.select(ADVANCED_SEARCH);
-		} else {
-			searchKind.select(SIMPLE_SEARCH);
-		}
-		createSpecificTextSearch();
-	}
-	
-	protected void createSpecificTextSearch() {
-		if (searchKind.getSelectionIndex() == ADVANCED_SEARCH) {
-			
-			if (container.getSelectedScope() == currentScope || currentScope == -1) { // if scope not changed or first time
-				if (umlTypeParticipantsList.isEmpty()) {
-					createUMLTypesList();
-				}
-
-				createProfilesList(false);
-				createStereotypesList(false);
-				
-				createAdvancedSearch(); // Don't call any methods of UI entities before this!
-				participantProfilesComboViewer.refresh();
-				participantUMLTypesTreeViewer.refresh();
-				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
-				
-				currentScope = container.getSelectedScope();
-			} else { // else: same code as refresh button except we need to recreate the UI
-				// Refresh UML types
-				if (umlTypeParticipantsList.isEmpty()) {
-					createUMLTypesList();
-				}
-				
-				// Refresh profiles
-				selectedProfile = null;
-				profilesComputed = false;
-				createProfilesList(true);
-				
-				// Refresh stereotypes
-				availableStereotypesComputed = false;
-				appliedStereotypesComputed = false;
-				createStereotypesList(true);
-								
-				// Refresh UI
-				createAdvancedSearch(); // Don't call any methods of UI entities before this!
-				participantProfilesComboViewer.refresh();
-				participantUMLTypesTreeViewer.refresh();
-				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
-				
-				currentScope = container.getSelectedScope();
-			}
-						
-			
-		} else {
-			createSimpleSearch();
-		}/* else {
-			Other search kinds in the future
-		}*/
-	}
-
-	protected void createUMLTypesList() {
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor thePM) throws InterruptedException {
-
-				// UML metaclasses
-				for (EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) {
-					if (eClassifier instanceof EClass) {
-						ParticipantTypeElement parentElement = new ParticipantTypeElement(eClassifier);
-						if (parentElement.getElement() instanceof EClass) {
-							List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
-							for (EObject eAttribute : ((EClass) (parentElement).getElement()).getEAllAttributes()) {
-								ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(eAttribute, (parentElement));
-								attributeList.add(attribute);
-							}
-							umlTypeParticipantsList.put(parentElement, attributeList);
-						}
-					}
-				}
-			}
-
-		};
-
-		try {
-			dialog.run(true, true, computeAvailableTypes);
-		} catch (InvocationTargetException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (InterruptedException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-
-	}
-	
-	protected void createProfilesList(boolean forceRefresh) {
-		if (forceRefresh || !profilesComputed) {
-			profiles.clear();
-			
-			ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-			IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
-				public void run(IProgressMonitor thePM) throws InterruptedException {
-					Collection<Profile> appliedProfiles = StereotypeCollector.getInstance().computeAppliedProfiles(container);
-					profiles.add(allProfiles);
-					profiles.addAll(appliedProfiles);
-					profilesComputed = true;
-				}
-			};
-
-			try {
-				dialog.run(true, true, computeAvailableTypes);
-				
-			} catch (InvocationTargetException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (InterruptedException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-	}
-	
-	protected void createStereotypesList(final boolean forceRefresh) {
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor thePM) throws InterruptedException {
-				if (forceRefresh || onlyAppliedStereotypesStateChanged) {
-					stereotypeParticipantsList.clear();
-					
-					Collection<Stereotype> computedStereotypes;
-
-					// Find available stereotypes
-					if (onlyAppliedStereotypes) {
-						if (forceRefresh || !appliedStereotypesComputed) {
-							if (appliedStereotypes != null) {
-								appliedStereotypes.clear();
-							}
-							
-							appliedStereotypes = StereotypeCollector.getInstance().computeAppliedStereotypes(container);
-							appliedStereotypesComputed = true;
-						}
-
-						computedStereotypes = appliedStereotypes;
-					} else { // Find applied stereotypes
-						if (forceRefresh || !availableStereotypesComputed) {
-							if (availableStereotypes != null) {
-								availableStereotypes.clear();
-							}
-							
-							availableStereotypes = StereotypeCollector.getInstance().computeAvailableStereotypes(container);
-							availableStereotypesComputed = true;
-						}
-
-						computedStereotypes = availableStereotypes;
-					}
-
-					// Fill the hash map for the treeviewer
-					for (Stereotype stereotype : computedStereotypes) {
-						ParticipantTypeElement parentElement = new ParticipantTypeElement(stereotype);
-						List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
-						for (Property property : ((Stereotype) parentElement.getElement()).getAllAttributes()) {
-							if (!property.getName().startsWith("base_")) { //$NON-NLS-1$
-								if (property.getType() instanceof Element) {
-									ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(property, parentElement);
-									attributeList.add(attribute);
-								}
-							}
-						}
-
-						stereotypeParticipantsList.put(parentElement, attributeList);
-					}
-					
-					onlyAppliedStereotypesStateChanged = false;
-				}
-			}
-		};
-
-		try {
-			dialog.run(true, true, computeAvailableTypes);
-		} catch (InvocationTargetException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (InterruptedException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-	}
-	
-	protected void filterParticipantStereotypesByProfile() {
-		if (selectedProfile == null) {
-			participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
-			participantStereotypesTreeViewer.refresh();
-			return;
-		}
-		
-		HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> filteredStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();		
-
-		Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
-			Stereotype stereotype = (Stereotype) ((ParticipantTypeElement) pair.getKey()).getElement();
-			if (EcoreUtil.getURI(stereotype.getProfile()).equals(EcoreUtil.getURI(selectedProfile))) {
-				filteredStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
-			}
-		}
-		
-		participantStereotypesTreeViewer.setInput(filteredStereotypeParticipantsList);
-		participantStereotypesTreeViewer.refresh();
-	}
-
-	protected void createAdvancedSearch() {	
-		profilesLabel = new Label(advancedSearchComposite, SWT.NONE);
-		profilesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		profilesLabel.setText(Messages.PapyrusSearchPage_51);
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		// Newline
-		
-		participantProfilesComboViewer = new ComboViewer(advancedSearchComposite, SWT.READ_ONLY);
-		participantProfilesComboViewer.setContentProvider(ArrayContentProvider.getInstance());
-		participantProfilesComboViewer.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				if (element instanceof Profile) {
-					return ((Profile) element).getName();
-				}
-				return super.getText(element);
-			}
-		});
-		participantProfilesComboViewer.setSorter(new ViewerSorter());
-		participantProfilesComboViewer.setInput(profiles);
-		if (selectedProfile == null) {
-			participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
-		} else {
-			participantProfilesComboViewer.setSelection(new StructuredSelection(selectedProfile));
-		}
-		participantProfilesComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (event.getSelection().isEmpty()) {
-					return;
-				}
-				
-				if (participantProfilesComboViewer.getStructuredSelection().getFirstElement() instanceof Profile) {
-					selectedProfile = (Profile) participantProfilesComboViewer.getStructuredSelection().getFirstElement();
-				} else {
-					selectedProfile = null;
-				}
-				
-				filterParticipantStereotypesByProfile();
-			}
-		});
-		
-		fBtnOnlyAppliedStereotypes = new Button(advancedSearchComposite, SWT.CHECK);
-		fBtnOnlyAppliedStereotypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		fBtnOnlyAppliedStereotypes.setText(Messages.PapyrusSearchPage_50);
-		fBtnOnlyAppliedStereotypes.setSelection(onlyAppliedStereotypes);
-		fBtnOnlyAppliedStereotypes.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				onlyAppliedStereotypes = fBtnOnlyAppliedStereotypes.getSelection();
-				
-				// Memorize previous stereotypes attributes that have been checked
-				HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
-				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
-				while (it.hasNext()) {
-					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
-					boolean toAdd = false;
-					if (pair.getKey().isChecked()) {
-						toAdd = true;
-					}
-					
-					if (!toAdd) {
-						for (ParticipantTypeAttribute attribute : pair.getValue()) {
-							if (attribute.isChecked()) {
-								toAdd = true;
-								break;
-							}
-						}
-					}
-					
-					if (toAdd) {
-						oldStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
-					}
-				}
-				
-				onlyAppliedStereotypesStateChanged = true;
-				createStereotypesList(false);
-				
-				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it2 = oldStereotypeParticipantsList.entrySet().iterator();
-				while (it2.hasNext()) {
-					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it2.next();
-					Stereotype oldStereotype = (Stereotype) oldPair.getKey().getElement();
-					
-					Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it3 = stereotypeParticipantsList.entrySet().iterator();
-					while (it3.hasNext()) {
-						Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> newPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it3.next();
-						Stereotype newStereotype = (Stereotype) newPair.getKey().getElement();
-						
-						// Lazy second condition because otherwise performance is impacted too much
-						if (EcoreUtil.getURI(newStereotype).equals(EcoreUtil.getURI(oldStereotype))
-								&& newPair.getValue().size() == oldPair.getValue().size()) {
-							newPair.getKey().setChecked(oldPair.getKey().isChecked());
-							for (int i = 0; i < oldPair.getValue().size(); i++) {
-								newPair.getValue().get(i).setChecked(oldPair.getValue().get(i).isChecked());
-							}
-						}
-					}
-				}
-				
-				filterParticipantStereotypesByProfile(); // This refreshes the list too
-			}
-		});
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		// Newline
-		
-		umlTypesLabel = new Label(advancedSearchComposite, SWT.NONE);
-		umlTypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		umlTypesLabel.setText(Messages.PapyrusSearchPage_44);
-		
-		stereotypesLabel = new Label(advancedSearchComposite, SWT.NONE);
-		stereotypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		stereotypesLabel.setText(Messages.PapyrusSearchPage_45);
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		// New line
-		
-		participantUMLTypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
-		participantUMLTypesTree.setLayout(new GridLayout());
-		GridData typesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
-		typesChechboxTreeViewerGridData.heightHint = 150;
-		participantUMLTypesTree.setLayoutData(typesChechboxTreeViewerGridData);
-		
-		participantStereotypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
-		participantStereotypesTree.setLayout(new GridLayout());
-		GridData stereotypesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
-		stereotypesChechboxTreeViewerGridData.heightHint = 150;
-		participantStereotypesTree.setLayoutData(stereotypesChechboxTreeViewerGridData);
-		
-		participantUMLTypesTreeViewer = (CheckboxTreeViewer) participantUMLTypesTree.getViewer();
-		participantUMLTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
-		participantUMLTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
-		participantUMLTypesTreeViewer.setSorter(new ViewerSorter());
-		participantUMLTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
-
-			public boolean isGrayed(Object element) {
-				return false;
-			}
-
-			public boolean isChecked(Object element) {
-				if (element instanceof ParticipantTypeElement) {
-
-					return ((ParticipantTypeElement) element).isChecked();
-
-				}
-				return false;
-			}
-		});
-		
-		participantStereotypesTreeViewer = (CheckboxTreeViewer) participantStereotypesTree.getViewer();
-		// TODO ParticipantStereotypeContentProvider
-		participantStereotypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
-		// TODO ParticipantStereotypeLabelProvider
-		participantStereotypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
-		participantStereotypesTreeViewer.setSorter(new ViewerSorter());
-		participantStereotypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
-
-			public boolean isGrayed(Object element) {
-				return false;
-			}
-
-			public boolean isChecked(Object element) {
-				if (element instanceof ParticipantTypeElement) {
-
-					return ((ParticipantTypeElement) element).isChecked();
-
-				}
-				return false;
-			}
-		});
-		
-		Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE);
-		participantManipualtionComposite.setLayout(new GridLayout(1, false));
-		participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true, 1, 1));
-
-		Button btnSelectSub = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnSelectSub.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnSelectSub.setText(Messages.PapyrusSearchPage_14);
-		btnSelectSub.setToolTipText(Messages.PapyrusSearchPageTooltip_1);
-		btnSelectSub.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				ISelection selection = participantUMLTypesTreeViewer.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
-
-					if (selectedElement instanceof ParticipantTypeElement) {
-						List<ParticipantTypeAttribute> attributeParentList = new ArrayList<ParticipantTypeAttribute>();
-
-						for (Object attribute : umlTypeParticipantsList.get(selectedElement)) {
-							if (attribute instanceof ParticipantTypeAttribute) {
-								if (((ParticipantTypeAttribute) attribute).isChecked()) {
-									attributeParentList.add(((ParticipantTypeAttribute) attribute));
-								}
-
-							}
-						}
-						if (((ParticipantTypeElement) selectedElement).getElement() instanceof EClass) {
-
-							selectAllSubUML((ParticipantTypeElement) selectedElement, attributeParentList);
-
-						} else if (((ParticipantTypeElement) selectedElement).getElement() instanceof Stereotype) {
-
-							selectAllSubSter((ParticipantTypeElement) selectedElement, attributeParentList);
-
-						}
-					}
-				}
-
-				participantUMLTypesTreeViewer.refresh();
-			}
-		});
-
-		Button btnSelectAll = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnSelectAll.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnSelectAll.setText(Messages.PapyrusSearchPage_9);
-
-		btnSelectAll.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
-					if (!element.isChecked()) {
-						element.setChecked(true);
-
-						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
-							attribute.setChecked(true);
-
-						}
-					}
-				}
-				participantUMLTypesTreeViewer.refresh();
-
-			}
-		});
-
-		Button btnDeselectAll = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnDeselectAll.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnDeselectAll.setText(Messages.PapyrusSearchPage_10);
-		btnDeselectAll.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
-					if (element.isChecked()) {
-						element.setChecked(false);
-
-						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
-							attribute.setChecked(false);
-
-
-						}
-					}
-				}
-				participantUMLTypesTreeViewer.refresh();
-			}
-		});
-		
-		Button btnSelectAllSt = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnSelectAllSt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnSelectAllSt.setText(Messages.PapyrusSearchPage_46);
-
-		btnSelectAllSt.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : stereotypeParticipantsList.keySet()) {
-					if (!element.isChecked()) {
-						element.setChecked(true);
-
-						for (ParticipantTypeAttribute attribute : stereotypeParticipantsList.get(element)) {
-							attribute.setChecked(true);
-						}
-					}
-				}
-				participantStereotypesTreeViewer.refresh();
-
-			}
-		});
-
-		Button btnDeselectAllSt = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnDeselectAllSt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnDeselectAllSt.setText(Messages.PapyrusSearchPage_47);
-		btnDeselectAllSt.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				for (ParticipantTypeElement element : stereotypeParticipantsList.keySet()) {
-					if (element.isChecked()) {
-						element.setChecked(false);
-
-						for (ParticipantTypeAttribute attribute : stereotypeParticipantsList.get(element)) {
-							attribute.setChecked(false);
-						}
-					}
-				}
-				participantStereotypesTreeViewer.refresh();
-			}
-		});
-		
-		Button btnRefreshTypes = new Button(participantManipualtionComposite, SWT.PUSH);
-		btnRefreshTypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		btnRefreshTypes.setText(Messages.PapyrusSearchPage_15);
-		btnRefreshTypes.setToolTipText(Messages.PapyrusSearchPageTooltip_2);
-		btnRefreshTypes.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				refreshByScope();
-			}
-		});
-		
-		participantUMLTypesTreeViewer.setInput(umlTypeParticipantsList);
-		((ICheckable) participantUMLTypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantUMLTypesTreeViewer, umlTypeParticipantsList));
-		
-		participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
-		((ICheckable) participantStereotypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantStereotypesTreeViewer, stereotypeParticipantsList));
-
-		// New line
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		fBtnSearchForAllSelected = new Button(advancedSearchComposite, SWT.CHECK);
-		fBtnSearchForAllSelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		fBtnSearchForAllSelected.setText(Messages.PapyrusSearchPage_13);
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		// New line
-		
-		//TODO Better solution than this empty label
-		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
-		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-		emptyLabel.setText("");
-		
-		fBtnSearchForAnySelected = new Button(advancedSearchComposite, SWT.CHECK);
-		fBtnSearchForAnySelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-		fBtnSearchForAnySelected.setText(Messages.PapyrusSearchPage_49);
-		
-		currentSearchKind = ADVANCED_SEARCH;
-		currentQueryKind = TEXT_QUERY_KIND;
-	}
-	
-	protected void refreshByScope() {
-		// Refresh UML types
-		if (umlTypeParticipantsList.isEmpty()) {
-			createUMLTypesList();
-		}
-		
-		// Refresh profiles
-		selectedProfile = null;
-		profilesComputed = false;
-		createProfilesList(true);
-		
-		// Refresh stereotypes
-		availableStereotypesComputed = false;
-		appliedStereotypesComputed = false;
-		createStereotypesList(true);
-		
-		
-		// Refresh UI
-		participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
-		participantProfilesComboViewer.refresh();
-		participantUMLTypesTreeViewer.refresh();
-		filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
-	}
-
-	protected void selectAllSubSter(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
-
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor thePM) throws InterruptedException {
-				for (Object element : umlTypeParticipantsList.keySet()) {
-					if (element instanceof ParticipantTypeElement) {
-						checkAllSubSter((ParticipantTypeElement) element, elementParent, attributeParentList);
-
-					}
-				}
-
-
-			}
-
-		};
-
-
-		try {
-			dialog.run(true, true, computeAvailableTypes);
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-
-
-	}
-
-	protected void checkAllSubSter(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {
-		if (element.getElement() instanceof Stereotype) {
-			List<Class> superTypes = ((Class) element.getElement()).getSuperClasses();
-
-			if (superTypes.contains(elementParent.getElement())) {
-				element.setChecked(true);
-
-
-				// Proceed with attributes
-				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
-					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
-						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
-
-							attributeToEvaluate.setChecked(true);
-
-
-						}
-
-					}
-				}
-			}
-		}
-	}
-
-	protected void selectAllSubUML(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
-
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
-
-			public void run(IProgressMonitor thePM) throws InterruptedException {
-				for (Object element : umlTypeParticipantsList.keySet()) {
-					if (element instanceof ParticipantTypeElement) {
-						checkAllSubUML((ParticipantTypeElement) element, elementParent, attributeParentList);
-
-					}
-				}
-			}
-
-		};
-
-		try {
-			dialog.run(true, true, computeAvailableTypes);
-		} catch (InvocationTargetException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (InterruptedException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-
-	}
-
-
-	protected void checkAllSubUML(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {
-		if (element.getElement() instanceof EClass) {
-			List<EClass> superTypes = ((EClass) element.getElement()).getEAllSuperTypes();
-
-			if (superTypes.contains(elementParent.getElement())) {
-				// participantTypesTreeViewer.setChecked(element, true);
-				element.setChecked(true);
-
-
-				// Proceed with attributes
-				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
-					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
-						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
-							attributeToEvaluate.setChecked(true);
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	protected void createSimpleSearch() {
-		Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE);
-		participantManipualtionComposite.setLayout(new GridLayout(1, false));
-		participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, true, 1, 1));
-
-
-		btnSearchInName = new Button(participantManipualtionComposite, SWT.RADIO);
-		btnSearchInName.setText(Messages.PapyrusSearchPage_16);
-		btnSearchInName.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 0, 1));
-		btnSearchInName.setSelection(true);
-
-
-		btnSearchAllStringAttributes = new Button(participantManipualtionComposite, SWT.RADIO);
-		btnSearchAllStringAttributes.setText(Messages.PapyrusSearchPage_17);
-		btnSearchAllStringAttributes.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
-		
-		currentSearchKind = SIMPLE_SEARCH;
-		currentQueryKind = TEXT_QUERY_KIND;
-	}
-
-
-	public Object[] getMetaClassesList() {
-		Set<EObject> umlMetaClasses = new HashSet<EObject>();
-
-		for (EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) {
-			if (eClassifier instanceof EClass) {
-				umlMetaClasses.add(eClassifier);
-			}
-		}
-		return umlMetaClasses.toArray();
-
-	}
-
-
-	protected void createOCLSearch(EObject root) {
-
-		Composite client = queryComposite;
-
-		Composite oclContextComposite = new Composite(client, SWT.NONE);
-		oclContextComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
-		oclContextComposite.setLayout(new GridLayout(2, false));
-
-		oclContext = new Text(oclContextComposite, SWT.BORDER);
-		oclContext.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		oclContext.setEnabled(false);
-		oclContext.setFocus();
-
-		Button btnSelectContext = new Button(oclContextComposite, SWT.PUSH);
-		btnSelectContext.setText(Messages.PapyrusSearchPage_18);
-		btnSelectContext.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-
-				LabelProviderService labelProviderService = new LabelProviderServiceImpl();
-				ILabelProvider labelProvider = labelProviderService.getLabelProvider();
-
-				ScopeEntry currentScope = getCurrentScopeEntry();
-
-				if (currentScope != null) {
-
-					try {
-						((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
-
-						ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(Display.getCurrent().getActiveShell(), labelProvider, new OCLContextContentProvider());
-						dialog.setTitle(Messages.PapyrusSearchPage_19);
-						dialog.setMessage(Messages.PapyrusSearchPage_20);
-						dialog.setInput(currentScope.getModelSet());
-						dialog.setAllowMultiple(false);
-						dialog.open();
-						Object selection = dialog.getFirstResult();
-
-						if (selection instanceof EObject) {
-
-							refreshSelection(selection);
-
-							if (contextObject instanceof NamedElement) {
-								oclContext.setText(((NamedElement) contextObject).getQualifiedName());
-							} else {
-								oclContext.setText(labelProvider.getText(contextObject));
-							}
-						}
-
-					} catch (NotFoundException notFoundException) {
-
-						Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
-					}
-				}
-
-			}
-		});
-		btnSelectContext.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
-
-		Injector injector = EssentialOCLActivator.getInstance().getInjector(EssentialOCLPlugin.LANGUAGE_ID);
-		Composite editorComposite = client;
-		oclEditor = new EmbeddedXtextEditor(editorComposite, injector, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-
-		oclEditor.getViewer().getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
-
-			public void verifyKey(VerifyEvent e) {
-				// System.out.println("verifyKey: " + e.keyCode);
-				if (e.keyCode == SWT.KEYPAD_CR || e.keyCode == SWT.CR) {
-					if ((e.stateMask & (SWT.CTRL | SWT.SHIFT)) == 0) {
-						e.doit = false;
-					}
-				}
-			}
-		});
-
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		data.heightHint = convertHeightInCharsToPixels(3);
-		editorComposite.setLayoutData(data);
-
-		refreshSelection(root);
-		
-		currentQueryKind = OCL_QUERY_KIND;
-	}
-
-	protected ScopeEntry getCurrentScopeEntry() {
-		if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
-			Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
-
-			// this is only used for OCL queries, which currently assume workspace-like availability of the model content
-			Collection<ScopeEntry> scopeEntries = WorkspaceQueryProvider.createScopeEntries(scope);
-
-			if (scopeEntries.size() == 1) {
-				Object[] entries = scopeEntries.toArray();
-				ScopeEntry selectedResource = (ScopeEntry) entries[0];
-
-				return selectedResource;
-			}
-		}
-		return null;
-	}
-
-	public void createControl(Composite parent) {
-
-		initializeDialogUnits(parent);
-		Composite searchComposite = new Composite(parent, SWT.NONE);
-		searchComposite.setFont(parent.getFont());
-		searchComposite.setLayout(new GridLayout(2, false));
-		searchComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-
-		Label lblSearchString = new Label(searchComposite, SWT.NONE);
-		lblSearchString.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
-		lblSearchString.setText(Messages.PapyrusSearchPage_4);
-
-		queryKind = new Combo(searchComposite, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
-		queryKind.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, false, false, 1, 1));
-		queryKind.add(Messages.PapyrusSearchPage_21);
-		queryKind.add(Messages.PapyrusSearchPage_22);
-
-		queryKind.select(TEXT_QUERY_KIND);
-
-		queryKind.addSelectionListener(new SelectionAdapter() {
-			
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (queryKind.getSelectionIndex() != currentQueryKind) {
-					for (Control childControl : queryComposite.getChildren()) {
-						childControl.dispose();
-					}
-
-					if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
-						createTextSearch();
-					} else {
-						if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
-
-							ScopeEntry currentScope = getCurrentScopeEntry();
-							if (currentScope != null) {
-								if (currentScope.getModelSet() != null) {
-
-									try {
-										EObject root = ((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
-										createOCLSearch(root);
-
-										if (contextObject instanceof NamedElement) {
-											oclContext.setText(((NamedElement) contextObject).getQualifiedName());
-										} else {
-											LabelProviderService labelProviderService = new LabelProviderServiceImpl();
-											ILabelProvider labelProvider = labelProviderService.getLabelProvider();
-											oclContext.setText(labelProvider.getText(contextObject));
-										}
-									} catch (NotFoundException notFoundException) {
-
-										Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
-									}
-								} else {
-									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_23, Messages.PapyrusSearchPage_24);
-									createTextSearch();
-									queryKind.select(TEXT_QUERY_KIND);
-								}
-							} else {
-								MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_25, Messages.PapyrusSearchPage_26);
-								createTextSearch();
-								queryKind.select(TEXT_QUERY_KIND);
-							}
-						} else {
-							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
-							createTextSearch();
-							queryKind.select(TEXT_QUERY_KIND);
-						}
-					}
-					queryComposite.layout();
-				}
-			}
-		});
-
-
-		queryComposite = new Composite(searchComposite, SWT.NONE);
-		queryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		queryComposite.setLayout(new GridLayout(1, false));
-
-		createTextSearch();
-
-		setControl(parent);
-	}
-
-	public boolean getSearchAllStringAttributes() {
-		if (btnSearchAllStringAttributes != null) {
-			return btnSearchAllStringAttributes.getSelection();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Validate syntax of the regular expression of the search query text.
-	 *
-	 * @return true, if successful
-	 */
-	private boolean validateRegex() {
-
-		try {
-			PatternHelper.getInstance().createPattern(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection());
-			searchQueryExplanatoryLabel.setForeground(getControl().getForeground());
-			searchQueryExplanatoryLabel.setText(""); //$NON-NLS-1$
-			return true;
-
-		} catch (PatternSyntaxException e) {
-			searchQueryExplanatoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
-			searchQueryExplanatoryLabel.setText(e.getDescription());
-
-			return false;
-		}
-	}
-
-	protected void refreshSelection(final Object selected) {
-		final BaseDocument editorDocument = (BaseDocument) oclEditor.getDocument();
-		editorDocument.modify(new IUnitOfWork<Object, XtextResource>() {
-
-			public Value exec(XtextResource resource) throws Exception {
-				Object selectedObject = selected;
-				if (selectedObject instanceof IOutlineNode) {
-					if (selectedObject instanceof EObjectNode) {
-						EObjectNode selectedObjectNode = (EObjectNode) selectedObject;
-						selectedObjectNode.getEObjectURI();
-						contextObject = null; // FIXME
-												// metamodelManager.loadResource(eObjectURI,
-												// null, null);
-					} else if (selectedObject instanceof EStructuralFeatureNode) {
-						contextObject = null;
-					} else {
-						contextObject = null;
-					}
-				} else {
-					if (selectedObject instanceof IAdaptable) {
-						selectedObject = ((IAdaptable) selectedObject).getAdapter(EObject.class);
-					}
-					if (selectedObject instanceof EObject) {
-						contextObject = (EObject) selectedObject;
-					} else {
-						contextObject = null;
-					}
-				}
-				EnvironmentFactory environmentFactory = getEnvironmentFactory();
-				parserContext = new EObjectContext(environmentFactory, null, contextObject);
-				EssentialOCLCSResource csResource = (EssentialOCLCSResource) resource;
-				if (csResource != null) {
-					if (contextObject != null) {
-						csResource.getCS2AS();			// FIXME redundant ??
-					}
-					ResourceSet resourceSet = oclEditor.getResourceSet();
-					if (resourceSet != null) {
-						environmentFactory.adapt(resourceSet);			// FIXME redundant ??
-					}
-					csResource.setParserContext(parserContext);
-				}
-
-				return null;
-			}
-		});
-	}
-
-
-	@SuppressWarnings("unused")
-	private Collection<ScopeEntry> createScopeEntries(Collection<URI> scope) {
-		Collection<ScopeEntry> results = new HashSet<ScopeEntry>();
-
-		for (URI resource : scope) {
-
-			ScopeEntry scopeEntry = new ScopeEntry(resource);
-
-			results.add(scopeEntry);
-
-		}
-
-		return results;
-	}
-
-	@SuppressWarnings("unused")
-	private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) {
-		List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
-
-		for (ParticipantTypeElement element : participantsList.keySet()) {
-			if (element.isChecked()) {
-				participantsToEvaluate.add(element);
-				for (ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
-					if (attributesToEvaluate.isChecked()) {
-						participantsToEvaluate.add(attributesToEvaluate);
-					}
-				}
-			}
-		}
-		return participantsToEvaluate;
-	}
-
-	public boolean performAction() {
-
-		if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
-			if (validateRegex()) {
-				Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
-				AbstractPapyrusQuery compositeQuery;
-				if (searchKind.getSelectionIndex() == SIMPLE_SEARCH) {
-					if (searchQueryText.getText().length() == 0) {
-						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_29, Messages.PapyrusSearchPage_30);
-						return false;
-					} else {
-						// One query per di file to avoid one single slow query on many files
-						ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size());
-						
-						for (URI uri : scope) {
-							Collection<URI> singleScope = new HashSet<URI>();
-							singleScope.add(uri);
-							
-							QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), singleScope);
-							ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info);
-							
-							queries.add((AbstractPapyrusQuery) query);
-						}
-						
-						compositeQuery = CompositePapyrusQuery.compose(queries);
-					}
-				} else {
-
-
-					List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
-					
-					for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
-						if (element.isChecked()) {
-							participantsToEvaluate.add(element);
-							
-							if (searchQueryText.getText().length() > 0) {
-								for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
-									if (attributesToEvaluate.isChecked()) {
-										participantsToEvaluate.add(attributesToEvaluate);
-									}
-								}
-							}
-						}
-					}
-					
-					for (ParticipantTypeElement element : this.stereotypeParticipantsList.keySet()) {
-						if (element.isChecked()) {
-							participantsToEvaluate.add(element);
-							
-							if (searchQueryText.getText().length() > 0) {
-								for (ParticipantTypeAttribute attributesToEvaluate : stereotypeParticipantsList.get(element)) {
-									if (attributesToEvaluate.isChecked()) {
-										participantsToEvaluate.add(attributesToEvaluate);
-									}
-								}
-							}
-						}
-					}
-					
-					if (participantsToEvaluate.size() == 0) {
-						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_31, Messages.PapyrusSearchPage_32);
-						return false;
-					} else {
-						// One query per di file to avoid one single slow query on many files
-						ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size());
-						
-						for (URI uri : scope) {
-							Collection<URI> singleScope = new HashSet<URI>();
-							singleScope.add(uri);
-							
-							QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, singleScope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection());
-							ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
-							
-							queries.add((AbstractPapyrusQuery) query);
-						}
-						
-						compositeQuery = CompositePapyrusQuery.compose(queries);
-					}
-
-				}
-				if (compositeQuery.canRunInBackground()) {
-					NewSearchUI.runQueryInBackground(compositeQuery);
-				}
-
-				return true;
-			} else {
-				MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, REGULAR_EXPRESSION_ILLFORMED);
-				return false;
-			}
-		} else {
-
-			ScopeEntry scopeEntry = getCurrentScopeEntry();
-
-			if (scopeEntry != null) {
-
-				try {
-
-					PivotUtil.checkResourceErrors("", oclEditor.getResource()); //$NON-NLS-1$
-					@SuppressWarnings("unused") ExpressionInOCL expressionInOCL = parserContext.getExpression((CSResource) oclEditor.getResource());
-					ISearchQuery query = new PapyrusOCLQuery((BaseDocument) oclEditor.getDocument(), parserContext, getEnvironmentFactory(), null, contextObject, scopeEntry);
-
-
-					if (query.canRunInBackground()) {
-						NewSearchUI.runQueryInBackground(query);
-					}
-				} catch (ParserException e) {
-					@SuppressWarnings("unused") Object value = new InvalidValueException(e, Messages.PapyrusSearchPage_35);
-					MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, OCL_QUERY_ILLFORMED);
-					return false;
-				}
-
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	public void setContainer(ISearchPageContainer container) {
-		this.container = container;
-		this.container.setPerformActionEnabled(true);
-	}
-
-	public boolean performReplace() {
-		if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
-			if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
-				if (validateRegex()) {
-					if (searchQueryText.getText().length() == 0) {
-						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_36, Messages.PapyrusSearchPage_37);
-						return false;
-					}
-
-					Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
-
-					AbstractPapyrusQuery query;
-					if (searchKind.getSelectionIndex() == SIMPLE_SEARCH) {
-						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), scope);
-						query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info);
-					} else {
-						List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
-						for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
-							if (element.isChecked()) {
-								participantsToEvaluate.add(element);
-								if (umlTypeParticipantsList.get(element).size() == 0) {
-									MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_38, Messages.PapyrusSearchPage_39);
-									return false;
-
-								} else {
-									for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
-										if (attributesToEvaluate.isChecked()) {
-											participantsToEvaluate.add(attributesToEvaluate);
-											boolean canDoReplace = false;
-											if (attributesToEvaluate.getElement() instanceof EAttribute) {
-												Object value = element.getElement().eGet((EAttribute) attributesToEvaluate.getElement());
-												if (value instanceof String) {
-													canDoReplace = true;
-												}
-											} else if (attributesToEvaluate.getElement() instanceof Property) {
-												Property property = (Property) attributesToEvaluate.getElement();
-												if (UMLUtil.isString(property.getType())) {
-													canDoReplace = true;
-												}
-											}
-											if (!canDoReplace) {
-												MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_40, Messages.PapyrusSearchPage_41);
-												return false;
-											}
-										}
-									}
-								}
-							}
-						}
-						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection());
-						query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
-
-					}
-
-					NewSearchUI.runQueryInForeground(container.getRunnableContext(), query);
-
-
-					Display.getCurrent().syncExec(new Runnable() {
-
-						public void run() {
-							ISearchResultViewPart view = NewSearchUI.activateSearchResultView();
-							if (view != null) {
-								ISearchResultPage page = view.getActivePage();
-
-								if (page instanceof PapyrusSearchResultPage) {
-									PapyrusSearchResultPage resultPage = (PapyrusSearchResultPage) page;
-									ReplaceAction replaceAction = new ReplaceAction(resultPage.getSite().getShell(), resultPage, null);
-									replaceAction.run();
-								}
-							}
-						}
-					});
-
-					NewSearchUI.removeQuery(query);
-					return true;
-				} else {
-					MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, REGULAR_EXPRESSION_ILLFORMED);
-					return false;
-				}
-			} else {
-				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
-				return false;
-			}
-		} else {
-			MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_42, Messages.PapyrusSearchPage_43);
-			return false;
-		}
-
-	}
-
-	protected EnvironmentFactory getEnvironmentFactory() {
-		return oclEditor.getOCL().getEnvironmentFactory();
-	}
-
-	protected void flushEvents() {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		while (workbench.getDisplay().readAndDispatch()) {
-			;
-		}
-	}
-
-	public void reset() {
-		if (oclEditor != null) {
-			flushEvents();
-			// editor.close(false);
-			flushEvents();
-		}
-		parserContext = null;
-		contextObject = null;
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 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
+ *  Christian W. Damus (CEA LIST) - Fix leaking of all UML models in search results
+ *  Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility
+ *  Christian W. Damus (CEA) - bug 434681
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.search.ui.pages;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.regex.PatternSyntaxException;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ICheckStateProvider;
+import org.eclipse.jface.viewers.ICheckable;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.ocl.examples.xtext.console.xtfo.EmbeddedXtextEditor;
+import org.eclipse.ocl.pivot.ExpressionInOCL;
+import org.eclipse.ocl.pivot.internal.context.EObjectContext;
+import org.eclipse.ocl.pivot.resource.CSResource;
+import org.eclipse.ocl.pivot.utilities.EnvironmentFactory;
+import org.eclipse.ocl.pivot.utilities.ParserContext;
+import org.eclipse.ocl.pivot.utilities.ParserException;
+import org.eclipse.ocl.pivot.utilities.PivotUtil;
+import org.eclipse.ocl.pivot.values.InvalidValueException;
+import org.eclipse.ocl.pivot.values.Value;
+import org.eclipse.ocl.xtext.base.ui.model.BaseDocument;
+import org.eclipse.ocl.xtext.essentialocl.ui.internal.EssentialOCLActivator;
+import org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLCSResource;
+import org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLPlugin;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;
+import org.eclipse.papyrus.uml.search.ui.Activator;
+import org.eclipse.papyrus.uml.search.ui.CheckBoxFilteredTree;
+import org.eclipse.papyrus.uml.search.ui.Messages;
+import org.eclipse.papyrus.uml.search.ui.actions.ReplaceAction;
+import org.eclipse.papyrus.uml.search.ui.listeners.ParticipantTypesTreeViewerCheckStateListener;
+import org.eclipse.papyrus.uml.search.ui.providers.OCLContextContentProvider;
+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeAttribute;
+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeContentProvider;
+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeElement;
+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeLabelProvider;
+import org.eclipse.papyrus.uml.search.ui.query.AbstractPapyrusQuery;
+import org.eclipse.papyrus.uml.search.ui.query.CompositePapyrusQuery;
+import org.eclipse.papyrus.uml.search.ui.query.CompositePapyrusQueryProvider;
+import org.eclipse.papyrus.uml.search.ui.query.PapyrusOCLQuery;
+import org.eclipse.papyrus.uml.search.ui.query.QueryInfo;
+import org.eclipse.papyrus.uml.search.ui.query.WorkspaceQueryProvider;
+import org.eclipse.papyrus.uml.stereotypecollector.StereotypeCollector;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.views.search.regex.PatternHelper;
+import org.eclipse.papyrus.views.search.scope.ScopeCollector;
+import org.eclipse.papyrus.views.search.scope.ScopeEntry;
+import org.eclipse.search.ui.IReplacePage;
+import org.eclipse.search.ui.ISearchPage;
+import org.eclipse.search.ui.ISearchPageContainer;
+import org.eclipse.search.ui.ISearchQuery;
+import org.eclipse.search.ui.ISearchResultPage;
+import org.eclipse.search.ui.ISearchResultViewPart;
+import org.eclipse.search.ui.NewSearchUI;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.VerifyKeyListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
+import org.eclipse.ui.dialogs.PatternFilter;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.ui.editor.outline.IOutlineNode;
+import org.eclipse.xtext.ui.editor.outline.impl.EObjectNode;
+import org.eclipse.xtext.ui.editor.outline.impl.EStructuralFeatureNode;
+import org.eclipse.xtext.util.concurrent.IUnitOfWork;
+
+import com.google.inject.Injector;
+
+/**
+ *
+ * Papyrus specific search page
+ * @since 2.0
+ *
+ */
+public class PapyrusSearchPage extends DialogPage implements ISearchPage, IReplacePage {
+	
+	private int currentScope = -1;
+
+	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> umlTypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
+
+	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> stereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
+	
+	private LinkedList<Object> profiles = new LinkedList<Object>();
+	
+	private String allProfiles = "*";
+	
+	private Collection<Stereotype> availableStereotypes;
+	
+	private Collection<Stereotype> appliedStereotypes;
+	
+	private boolean profilesComputed = false;
+	
+	private boolean availableStereotypesComputed = false;
+	
+	private boolean appliedStereotypesComputed = false;
+
+	private static final String REGULAR_EXPRESSION_ILLFORMED = Messages.PapyrusSearchPage_0;
+
+	private static final String OCL_QUERY_ILLFORMED = Messages.PapyrusSearchPage_0;
+
+	private static final String SEARCH_ISSUE = Messages.PapyrusSearchPage_1;
+
+	private Text searchQueryText;
+
+	private Text oclContext;
+
+	private ISearchPageContainer container;
+
+	private CheckBoxFilteredTree participantUMLTypesTree;
+
+	private CheckBoxFilteredTree participantStereotypesTree;
+	
+	private CheckboxTreeViewer participantUMLTypesTreeViewer;
+	
+	private CheckboxTreeViewer participantStereotypesTreeViewer;
+	
+	private ComboViewer participantProfilesComboViewer;
+
+	private Label searchQueryExplanatoryLabel;
+
+	private Button btnRegularExpression;
+
+	private Button btnCaseSensitive;
+
+	private Button btnSearchAllStringAttributes;
+
+	private Button btnSearchInName;
+
+	private Combo queryKind;
+
+	private Combo searchKind;
+
+	private EmbeddedXtextEditor oclEditor;
+
+	private Composite queryComposite;
+
+	private EObject contextObject;
+
+	private static final int TEXT_QUERY_KIND = 0;
+	
+	private static final int OCL_QUERY_KIND = 1;
+
+	private static final int SIMPLE_SEARCH = 0;
+
+	private static final int ADVANCED_SEARCH = 1;
+	
+	private int currentSearchKind = SIMPLE_SEARCH;
+	
+	private int currentQueryKind = TEXT_QUERY_KIND;
+	
+	private boolean onlyAppliedStereotypes = false;
+	
+	private boolean onlyAppliedStereotypesStateChanged = true;
+	
+	private Profile selectedProfile = null;
+
+	private ParserContext parserContext;
+
+//	private ModelManager modelManager = null;
+
+	protected Composite textQueryComposite;
+
+	private Composite advancedSearchComposite;
+
+	private Composite textQueryFieldsComposite;
+	
+	private Button fBtnOnlyAppliedStereotypes;
+	
+	private Button fBtnSearchForAllSelected;
+	
+	private Button fBtnSearchForAnySelected;
+
+	private Label umlTypesLabel;
+	
+	private Label stereotypesLabel;
+	
+	private Label profilesLabel;
+	
+	private Label emptyLabel;
+
+	protected void createTextSearch() {
+		textQueryComposite = new Composite(queryComposite, SWT.NONE);
+		textQueryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		textQueryComposite.setLayout(new GridLayout(2, false));
+
+		textQueryFieldsComposite = new Composite(textQueryComposite, SWT.NONE);
+		textQueryFieldsComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+		textQueryFieldsComposite.setLayout(new GridLayout(1, false));
+
+		searchQueryExplanatoryLabel = new Label(textQueryFieldsComposite, SWT.NONE);
+		searchQueryExplanatoryLabel.setText(Messages.PapyrusSearchPage_48);
+		searchQueryExplanatoryLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		
+		searchQueryText = new Text(textQueryFieldsComposite, SWT.BORDER);
+		searchQueryText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		searchQueryText.addModifyListener(new ModifyListener() {
+
+			public void modifyText(ModifyEvent evt) {
+				validateRegex();
+			}
+		});
+		searchQueryText.setFocus();
+
+		Composite compositeParameters = new Composite(textQueryComposite, SWT.NONE);
+		compositeParameters.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		compositeParameters.setLayout(new GridLayout(1, false));
+
+		btnCaseSensitive = new Button(compositeParameters, SWT.CHECK);
+		btnCaseSensitive.setText(Messages.PapyrusSearchPage_5);
+
+		btnRegularExpression = new Button(compositeParameters, SWT.CHECK);
+		btnRegularExpression.setText(Messages.PapyrusSearchPage_6);
+		btnRegularExpression.addSelectionListener(new SelectionListener() {
+
+			public void widgetSelected(SelectionEvent e) {
+				btnCaseSensitive.setEnabled(!btnRegularExpression.getSelection());
+				validateRegex();
+				searchQueryText.forceFocus();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				widgetSelected(e);
+			}
+		});
+
+		Group grpSearchFor = new Group(textQueryComposite, SWT.NONE);
+		grpSearchFor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+		grpSearchFor.setLayout(new GridLayout(1, false));
+		grpSearchFor.setText(Messages.PapyrusSearchPage_8);
+
+		Composite groupComposite = new Composite(grpSearchFor, SWT.NONE);
+		groupComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		groupComposite.setLayout(new GridLayout(2, false));
+
+		Label lblSearchKind = new Label(groupComposite, SWT.NONE);
+		lblSearchKind.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
+		lblSearchKind.setText(Messages.PapyrusSearchPage_7);
+
+		searchKind = new Combo(groupComposite, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+		searchKind.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+		searchKind.add(Messages.PapyrusSearchPage_11);
+		searchKind.add(Messages.PapyrusSearchPage_12);
+		searchKind.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (searchKind.getSelectionIndex() != currentSearchKind) {
+					for (Control childControl : advancedSearchComposite.getChildren()) {
+						childControl.dispose();
+					}
+				
+					createSpecificTextSearch();
+					
+					advancedSearchComposite.layout();
+				}
+			}
+		});
+
+		advancedSearchComposite = new Composite(groupComposite, SWT.NONE);
+		// gd_advancedSearchComposite.widthHint = 479;
+		advancedSearchComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+		advancedSearchComposite.setLayout(new GridLayout(3, false));
+
+		if (currentSearchKind == ADVANCED_SEARCH) {
+			searchKind.select(ADVANCED_SEARCH);
+		} else {
+			searchKind.select(SIMPLE_SEARCH);
+		}
+		createSpecificTextSearch();
+	}
+	
+	protected void createSpecificTextSearch() {
+		if (searchKind.getSelectionIndex() == ADVANCED_SEARCH) {
+			
+			if (container.getSelectedScope() == currentScope || currentScope == -1) { // if scope not changed or first time
+				if (umlTypeParticipantsList.isEmpty()) {
+					createUMLTypesList();
+				}
+
+				createProfilesList(false);
+				createStereotypesList(false);
+				
+				createAdvancedSearch(); // Don't call any methods of UI entities before this!
+				participantProfilesComboViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
+				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+				
+				currentScope = container.getSelectedScope();
+			} else { // else: same code as refresh button except we need to recreate the UI
+				// Refresh UML types
+				if (umlTypeParticipantsList.isEmpty()) {
+					createUMLTypesList();
+				}
+				
+				// Refresh profiles
+				selectedProfile = null;
+				profilesComputed = false;
+				createProfilesList(true);
+				
+				// Refresh stereotypes
+				availableStereotypesComputed = false;
+				appliedStereotypesComputed = false;
+				createStereotypesList(true);
+								
+				// Refresh UI
+				createAdvancedSearch(); // Don't call any methods of UI entities before this!
+				participantProfilesComboViewer.refresh();
+				participantUMLTypesTreeViewer.refresh();
+				filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+				
+				currentScope = container.getSelectedScope();
+			}
+						
+			
+		} else {
+			createSimpleSearch();
+		}/* else {
+			Other search kinds in the future
+		}*/
+	}
+
+	protected void createUMLTypesList() {
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor thePM) throws InterruptedException {
+
+				// UML metaclasses
+				for (EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) {
+					if (eClassifier instanceof EClass) {
+						ParticipantTypeElement parentElement = new ParticipantTypeElement(eClassifier);
+						if (parentElement.getElement() instanceof EClass) {
+							List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
+							for (EObject eAttribute : ((EClass) (parentElement).getElement()).getEAllAttributes()) {
+								ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(eAttribute, (parentElement));
+								attributeList.add(attribute);
+							}
+							umlTypeParticipantsList.put(parentElement, attributeList);
+						}
+					}
+				}
+			}
+
+		};
+
+		try {
+			dialog.run(true, true, computeAvailableTypes);
+		} catch (InvocationTargetException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+	}
+	
+	protected void createProfilesList(boolean forceRefresh) {
+		if (forceRefresh || !profilesComputed) {
+			profiles.clear();
+			
+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+			IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+				public void run(IProgressMonitor thePM) throws InterruptedException {
+					Collection<Profile> appliedProfiles = StereotypeCollector.getInstance().computeAppliedProfiles(container);
+					profiles.add(allProfiles);
+					profiles.addAll(appliedProfiles);
+					profilesComputed = true;
+				}
+			};
+
+			try {
+				dialog.run(true, true, computeAvailableTypes);
+				
+			} catch (InvocationTargetException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			} catch (InterruptedException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+		}
+	}
+	
+	protected void createStereotypesList(final boolean forceRefresh) {
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor thePM) throws InterruptedException {
+				if (forceRefresh || onlyAppliedStereotypesStateChanged) {
+					stereotypeParticipantsList.clear();
+					
+					Collection<Stereotype> computedStereotypes;
+
+					// Find available stereotypes
+					if (onlyAppliedStereotypes) {
+						if (forceRefresh || !appliedStereotypesComputed) {
+							if (appliedStereotypes != null) {
+								appliedStereotypes.clear();
+							}
+							
+							appliedStereotypes = StereotypeCollector.getInstance().computeAppliedStereotypes(container);
+							appliedStereotypesComputed = true;
+						}
+
+						computedStereotypes = appliedStereotypes;
+					} else { // Find applied stereotypes
+						if (forceRefresh || !availableStereotypesComputed) {
+							if (availableStereotypes != null) {
+								availableStereotypes.clear();
+							}
+							
+							availableStereotypes = StereotypeCollector.getInstance().computeAvailableStereotypes(container);
+							availableStereotypesComputed = true;
+						}
+
+						computedStereotypes = availableStereotypes;
+					}
+
+					// Fill the hash map for the treeviewer
+					for (Stereotype stereotype : computedStereotypes) {
+						ParticipantTypeElement parentElement = new ParticipantTypeElement(stereotype);
+						List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>();
+						for (Property property : ((Stereotype) parentElement.getElement()).getAllAttributes()) {
+							if (!property.getName().startsWith("base_")) { //$NON-NLS-1$
+								if (property.getType() instanceof Element) {
+									ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(property, parentElement);
+									attributeList.add(attribute);
+								}
+							}
+						}
+
+						stereotypeParticipantsList.put(parentElement, attributeList);
+					}
+					
+					onlyAppliedStereotypesStateChanged = false;
+				}
+			}
+		};
+
+		try {
+			dialog.run(true, true, computeAvailableTypes);
+		} catch (InvocationTargetException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+	}
+	
+	protected void filterParticipantStereotypesByProfile() {
+		if (selectedProfile == null) {
+			participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
+			participantStereotypesTreeViewer.refresh();
+			return;
+		}
+		
+		HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> filteredStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();		
+
+		Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
+			Stereotype stereotype = (Stereotype) ((ParticipantTypeElement) pair.getKey()).getElement();
+			if (EcoreUtil.getURI(stereotype.getProfile()).equals(EcoreUtil.getURI(selectedProfile))) {
+				filteredStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
+			}
+		}
+		
+		participantStereotypesTreeViewer.setInput(filteredStereotypeParticipantsList);
+		participantStereotypesTreeViewer.refresh();
+	}
+
+	protected void createAdvancedSearch() {	
+		profilesLabel = new Label(advancedSearchComposite, SWT.NONE);
+		profilesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		profilesLabel.setText(Messages.PapyrusSearchPage_51);
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// Newline
+		
+		participantProfilesComboViewer = new ComboViewer(advancedSearchComposite, SWT.READ_ONLY);
+		participantProfilesComboViewer.setContentProvider(ArrayContentProvider.getInstance());
+		participantProfilesComboViewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				if (element instanceof Profile) {
+					return ((Profile) element).getName();
+				}
+				return super.getText(element);
+			}
+		});
+		participantProfilesComboViewer.setSorter(new ViewerSorter());
+		participantProfilesComboViewer.setInput(profiles);
+		if (selectedProfile == null) {
+			participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
+		} else {
+			participantProfilesComboViewer.setSelection(new StructuredSelection(selectedProfile));
+		}
+		participantProfilesComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			public void selectionChanged(SelectionChangedEvent event) {
+				if (event.getSelection().isEmpty()) {
+					return;
+				}
+				
+				if (participantProfilesComboViewer.getStructuredSelection().getFirstElement() instanceof Profile) {
+					selectedProfile = (Profile) participantProfilesComboViewer.getStructuredSelection().getFirstElement();
+				} else {
+					selectedProfile = null;
+				}
+				
+				filterParticipantStereotypesByProfile();
+			}
+		});
+		
+		fBtnOnlyAppliedStereotypes = new Button(advancedSearchComposite, SWT.CHECK);
+		fBtnOnlyAppliedStereotypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		fBtnOnlyAppliedStereotypes.setText(Messages.PapyrusSearchPage_50);
+		fBtnOnlyAppliedStereotypes.setSelection(onlyAppliedStereotypes);
+		fBtnOnlyAppliedStereotypes.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				onlyAppliedStereotypes = fBtnOnlyAppliedStereotypes.getSelection();
+				
+				// Memorize previous stereotypes attributes that have been checked
+				HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
+				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator();
+				while (it.hasNext()) {
+					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next();
+					boolean toAdd = false;
+					if (pair.getKey().isChecked()) {
+						toAdd = true;
+					}
+					
+					if (!toAdd) {
+						for (ParticipantTypeAttribute attribute : pair.getValue()) {
+							if (attribute.isChecked()) {
+								toAdd = true;
+								break;
+							}
+						}
+					}
+					
+					if (toAdd) {
+						oldStereotypeParticipantsList.put(pair.getKey(), pair.getValue());
+					}
+				}
+				
+				onlyAppliedStereotypesStateChanged = true;
+				createStereotypesList(false);
+				
+				Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it2 = oldStereotypeParticipantsList.entrySet().iterator();
+				while (it2.hasNext()) {
+					Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it2.next();
+					Stereotype oldStereotype = (Stereotype) oldPair.getKey().getElement();
+					
+					Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it3 = stereotypeParticipantsList.entrySet().iterator();
+					while (it3.hasNext()) {
+						Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> newPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it3.next();
+						Stereotype newStereotype = (Stereotype) newPair.getKey().getElement();
+						
+						// Lazy second condition because otherwise performance is impacted too much
+						if (EcoreUtil.getURI(newStereotype).equals(EcoreUtil.getURI(oldStereotype))
+								&& newPair.getValue().size() == oldPair.getValue().size()) {
+							newPair.getKey().setChecked(oldPair.getKey().isChecked());
+							for (int i = 0; i < oldPair.getValue().size(); i++) {
+								newPair.getValue().get(i).setChecked(oldPair.getValue().get(i).isChecked());
+							}
+						}
+					}
+				}
+				
+				filterParticipantStereotypesByProfile(); // This refreshes the list too
+			}
+		});
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// Newline
+		
+		umlTypesLabel = new Label(advancedSearchComposite, SWT.NONE);
+		umlTypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		umlTypesLabel.setText(Messages.PapyrusSearchPage_44);
+		
+		stereotypesLabel = new Label(advancedSearchComposite, SWT.NONE);
+		stereotypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		stereotypesLabel.setText(Messages.PapyrusSearchPage_45);
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// New line
+		
+		participantUMLTypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
+		participantUMLTypesTree.setLayout(new GridLayout());
+		GridData typesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
+		typesChechboxTreeViewerGridData.heightHint = 150;
+		participantUMLTypesTree.setLayoutData(typesChechboxTreeViewerGridData);
+		
+		participantStereotypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true);
+		participantStereotypesTree.setLayout(new GridLayout());
+		GridData stereotypesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
+		stereotypesChechboxTreeViewerGridData.heightHint = 150;
+		participantStereotypesTree.setLayoutData(stereotypesChechboxTreeViewerGridData);
+		
+		participantUMLTypesTreeViewer = (CheckboxTreeViewer) participantUMLTypesTree.getViewer();
+		participantUMLTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
+		participantUMLTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
+		participantUMLTypesTreeViewer.setSorter(new ViewerSorter());
+		participantUMLTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
+
+			public boolean isGrayed(Object element) {
+				return false;
+			}
+
+			public boolean isChecked(Object element) {
+				if (element instanceof ParticipantTypeElement) {
+
+					return ((ParticipantTypeElement) element).isChecked();
+
+				}
+				return false;
+			}
+		});
+		
+		participantStereotypesTreeViewer = (CheckboxTreeViewer) participantStereotypesTree.getViewer();
+		// TODO ParticipantStereotypeContentProvider
+		participantStereotypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());
+		// TODO ParticipantStereotypeLabelProvider
+		participantStereotypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
+		participantStereotypesTreeViewer.setSorter(new ViewerSorter());
+		participantStereotypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
+
+			public boolean isGrayed(Object element) {
+				return false;
+			}
+
+			public boolean isChecked(Object element) {
+				if (element instanceof ParticipantTypeElement) {
+
+					return ((ParticipantTypeElement) element).isChecked();
+
+				}
+				return false;
+			}
+		});
+		
+		Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE);
+		participantManipualtionComposite.setLayout(new GridLayout(1, false));
+		participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true, 1, 1));
+
+		Button btnSelectSub = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnSelectSub.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnSelectSub.setText(Messages.PapyrusSearchPage_14);
+		btnSelectSub.setToolTipText(Messages.PapyrusSearchPageTooltip_1);
+		btnSelectSub.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				ISelection selection = participantUMLTypesTreeViewer.getSelection();
+				if (selection instanceof IStructuredSelection) {
+					Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
+
+					if (selectedElement instanceof ParticipantTypeElement) {
+						List<ParticipantTypeAttribute> attributeParentList = new ArrayList<ParticipantTypeAttribute>();
+
+						for (Object attribute : umlTypeParticipantsList.get(selectedElement)) {
+							if (attribute instanceof ParticipantTypeAttribute) {
+								if (((ParticipantTypeAttribute) attribute).isChecked()) {
+									attributeParentList.add(((ParticipantTypeAttribute) attribute));
+								}
+
+							}
+						}
+						if (((ParticipantTypeElement) selectedElement).getElement() instanceof EClass) {
+
+							selectAllSubUML((ParticipantTypeElement) selectedElement, attributeParentList);
+
+						} else if (((ParticipantTypeElement) selectedElement).getElement() instanceof Stereotype) {
+
+							selectAllSubSter((ParticipantTypeElement) selectedElement, attributeParentList);
+
+						}
+					}
+				}
+
+				participantUMLTypesTreeViewer.refresh();
+			}
+		});
+
+		Button btnSelectAll = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnSelectAll.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnSelectAll.setText(Messages.PapyrusSearchPage_9);
+
+		btnSelectAll.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
+					if (!element.isChecked()) {
+						element.setChecked(true);
+
+						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
+							attribute.setChecked(true);
+
+						}
+					}
+				}
+				participantUMLTypesTreeViewer.refresh();
+
+			}
+		});
+
+		Button btnDeselectAll = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnDeselectAll.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnDeselectAll.setText(Messages.PapyrusSearchPage_10);
+		btnDeselectAll.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				for (ParticipantTypeElement element : umlTypeParticipantsList.keySet()) {
+					if (element.isChecked()) {
+						element.setChecked(false);
+
+						for (ParticipantTypeAttribute attribute : umlTypeParticipantsList.get(element)) {
+							attribute.setChecked(false);
+
+
+						}
+					}
+				}
+				participantUMLTypesTreeViewer.refresh();
+			}
+		});
+		
+		Button btnSelectAllSt = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnSelectAllSt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnSelectAllSt.setText(Messages.PapyrusSearchPage_46);
+
+		btnSelectAllSt.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				for (ParticipantTypeElement element : stereotypeParticipantsList.keySet()) {
+					if (!element.isChecked()) {
+						element.setChecked(true);
+
+						for (ParticipantTypeAttribute attribute : stereotypeParticipantsList.get(element)) {
+							attribute.setChecked(true);
+						}
+					}
+				}
+				participantStereotypesTreeViewer.refresh();
+
+			}
+		});
+
+		Button btnDeselectAllSt = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnDeselectAllSt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnDeselectAllSt.setText(Messages.PapyrusSearchPage_47);
+		btnDeselectAllSt.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				for (ParticipantTypeElement element : stereotypeParticipantsList.keySet()) {
+					if (element.isChecked()) {
+						element.setChecked(false);
+
+						for (ParticipantTypeAttribute attribute : stereotypeParticipantsList.get(element)) {
+							attribute.setChecked(false);
+						}
+					}
+				}
+				participantStereotypesTreeViewer.refresh();
+			}
+		});
+		
+		Button btnRefreshTypes = new Button(participantManipualtionComposite, SWT.PUSH);
+		btnRefreshTypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		btnRefreshTypes.setText(Messages.PapyrusSearchPage_15);
+		btnRefreshTypes.setToolTipText(Messages.PapyrusSearchPageTooltip_2);
+		btnRefreshTypes.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+				refreshByScope();
+			}
+		});
+		
+		participantUMLTypesTreeViewer.setInput(umlTypeParticipantsList);
+		((ICheckable) participantUMLTypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantUMLTypesTreeViewer, umlTypeParticipantsList));
+		
+		participantStereotypesTreeViewer.setInput(stereotypeParticipantsList);
+		((ICheckable) participantStereotypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantStereotypesTreeViewer, stereotypeParticipantsList));
+
+		// New line
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		fBtnSearchForAllSelected = new Button(advancedSearchComposite, SWT.CHECK);
+		fBtnSearchForAllSelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		fBtnSearchForAllSelected.setText(Messages.PapyrusSearchPage_13);
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		// New line
+		
+		//TODO Better solution than this empty label
+		emptyLabel = new Label(advancedSearchComposite, SWT.NONE);
+		emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+		emptyLabel.setText("");
+		
+		fBtnSearchForAnySelected = new Button(advancedSearchComposite, SWT.CHECK);
+		fBtnSearchForAnySelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		fBtnSearchForAnySelected.setText(Messages.PapyrusSearchPage_49);
+		
+		currentSearchKind = ADVANCED_SEARCH;
+		currentQueryKind = TEXT_QUERY_KIND;
+	}
+	
+	protected void refreshByScope() {
+		// Refresh UML types
+		if (umlTypeParticipantsList.isEmpty()) {
+			createUMLTypesList();
+		}
+		
+		// Refresh profiles
+		selectedProfile = null;
+		profilesComputed = false;
+		createProfilesList(true);
+		
+		// Refresh stereotypes
+		availableStereotypesComputed = false;
+		appliedStereotypesComputed = false;
+		createStereotypesList(true);
+		
+		
+		// Refresh UI
+		participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles));
+		participantProfilesComboViewer.refresh();
+		participantUMLTypesTreeViewer.refresh();
+		filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer
+	}
+
+	protected void selectAllSubSter(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
+
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor thePM) throws InterruptedException {
+				for (Object element : umlTypeParticipantsList.keySet()) {
+					if (element instanceof ParticipantTypeElement) {
+						checkAllSubSter((ParticipantTypeElement) element, elementParent, attributeParentList);
+
+					}
+				}
+
+
+			}
+
+		};
+
+
+		try {
+			dialog.run(true, true, computeAvailableTypes);
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+
+
+	}
+
+	protected void checkAllSubSter(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {
+		if (element.getElement() instanceof Stereotype) {
+			List<Class> superTypes = ((Class) element.getElement()).getSuperClasses();
+
+			if (superTypes.contains(elementParent.getElement())) {
+				element.setChecked(true);
+
+
+				// Proceed with attributes
+				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
+					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
+						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
+
+							attributeToEvaluate.setChecked(true);
+
+
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+	protected void selectAllSubUML(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
+
+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
+
+			public void run(IProgressMonitor thePM) throws InterruptedException {
+				for (Object element : umlTypeParticipantsList.keySet()) {
+					if (element instanceof ParticipantTypeElement) {
+						checkAllSubUML((ParticipantTypeElement) element, elementParent, attributeParentList);
+
+					}
+				}
+			}
+
+		};
+
+		try {
+			dialog.run(true, true, computeAvailableTypes);
+		} catch (InvocationTargetException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+	}
+
+
+	protected void checkAllSubUML(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {
+		if (element.getElement() instanceof EClass) {
+			List<EClass> superTypes = ((EClass) element.getElement()).getEAllSuperTypes();
+
+			if (superTypes.contains(elementParent.getElement())) {
+				// participantTypesTreeViewer.setChecked(element, true);
+				element.setChecked(true);
+
+
+				// Proceed with attributes
+				for (ParticipantTypeAttribute attributeParent : attributeParentList) {
+					for (ParticipantTypeAttribute attributeToEvaluate : umlTypeParticipantsList.get(element)) {
+						if (attributeParent.getElement() == attributeToEvaluate.getElement()) {
+							attributeToEvaluate.setChecked(true);
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	protected void createSimpleSearch() {
+		Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE);
+		participantManipualtionComposite.setLayout(new GridLayout(1, false));
+		participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, true, 1, 1));
+
+
+		btnSearchInName = new Button(participantManipualtionComposite, SWT.RADIO);
+		btnSearchInName.setText(Messages.PapyrusSearchPage_16);
+		btnSearchInName.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 0, 1));
+		btnSearchInName.setSelection(true);
+
+
+		btnSearchAllStringAttributes = new Button(participantManipualtionComposite, SWT.RADIO);
+		btnSearchAllStringAttributes.setText(Messages.PapyrusSearchPage_17);
+		btnSearchAllStringAttributes.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
+		
+		currentSearchKind = SIMPLE_SEARCH;
+		currentQueryKind = TEXT_QUERY_KIND;
+	}
+
+
+	public Object[] getMetaClassesList() {
+		Set<EObject> umlMetaClasses = new HashSet<EObject>();
+
+		for (EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) {
+			if (eClassifier instanceof EClass) {
+				umlMetaClasses.add(eClassifier);
+			}
+		}
+		return umlMetaClasses.toArray();
+
+	}
+
+
+	protected void createOCLSearch(EObject root) {
+
+		Composite client = queryComposite;
+
+		Composite oclContextComposite = new Composite(client, SWT.NONE);
+		oclContextComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+		oclContextComposite.setLayout(new GridLayout(2, false));
+
+		oclContext = new Text(oclContextComposite, SWT.BORDER);
+		oclContext.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		oclContext.setEnabled(false);
+		oclContext.setFocus();
+
+		Button btnSelectContext = new Button(oclContextComposite, SWT.PUSH);
+		btnSelectContext.setText(Messages.PapyrusSearchPage_18);
+		btnSelectContext.addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseUp(MouseEvent e) {
+
+				LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+				ILabelProvider labelProvider = labelProviderService.getLabelProvider();
+
+				ScopeEntry currentScope = getCurrentScopeEntry();
+
+				if (currentScope != null) {
+
+					try {
+						((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
+
+						ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(Display.getCurrent().getActiveShell(), labelProvider, new OCLContextContentProvider());
+						dialog.setTitle(Messages.PapyrusSearchPage_19);
+						dialog.setMessage(Messages.PapyrusSearchPage_20);
+						dialog.setInput(currentScope.getModelSet());
+						dialog.setAllowMultiple(false);
+						dialog.open();
+						Object selection = dialog.getFirstResult();
+
+						if (selection instanceof EObject) {
+
+							refreshSelection(selection);
+
+							if (contextObject instanceof NamedElement) {
+								oclContext.setText(((NamedElement) contextObject).getQualifiedName());
+							} else {
+								oclContext.setText(labelProvider.getText(contextObject));
+							}
+						}
+
+					} catch (NotFoundException notFoundException) {
+
+						Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
+					}
+				}
+
+			}
+		});
+		btnSelectContext.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
+
+		Injector injector = EssentialOCLActivator.getInstance().getInjector(EssentialOCLPlugin.LANGUAGE_ID);
+		Composite editorComposite = client;
+		oclEditor = new EmbeddedXtextEditor(editorComposite, injector, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+
+		oclEditor.getViewer().getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
+
+			public void verifyKey(VerifyEvent e) {
+				// System.out.println("verifyKey: " + e.keyCode);
+				if (e.keyCode == SWT.KEYPAD_CR || e.keyCode == SWT.CR) {
+					if ((e.stateMask & (SWT.CTRL | SWT.SHIFT)) == 0) {
+						e.doit = false;
+					}
+				}
+			}
+		});
+
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
+		data.heightHint = convertHeightInCharsToPixels(3);
+		editorComposite.setLayoutData(data);
+
+		refreshSelection(root);
+		
+		currentQueryKind = OCL_QUERY_KIND;
+	}
+
+	protected ScopeEntry getCurrentScopeEntry() {
+		if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
+			Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
+
+			// this is only used for OCL queries, which currently assume workspace-like availability of the model content
+			Collection<ScopeEntry> scopeEntries = WorkspaceQueryProvider.createScopeEntries(scope);
+
+			if (scopeEntries.size() == 1) {
+				Object[] entries = scopeEntries.toArray();
+				ScopeEntry selectedResource = (ScopeEntry) entries[0];
+
+				return selectedResource;
+			}
+		}
+		return null;
+	}
+
+	public void createControl(Composite parent) {
+
+		initializeDialogUnits(parent);
+		Composite searchComposite = new Composite(parent, SWT.NONE);
+		searchComposite.setFont(parent.getFont());
+		searchComposite.setLayout(new GridLayout(2, false));
+		searchComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+
+		Label lblSearchString = new Label(searchComposite, SWT.NONE);
+		lblSearchString.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
+		lblSearchString.setText(Messages.PapyrusSearchPage_4);
+
+		queryKind = new Combo(searchComposite, SWT.VERTICAL | SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+		queryKind.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, false, false, 1, 1));
+		queryKind.add(Messages.PapyrusSearchPage_21);
+		queryKind.add(Messages.PapyrusSearchPage_22);
+
+		queryKind.select(TEXT_QUERY_KIND);
+
+		queryKind.addSelectionListener(new SelectionAdapter() {
+			
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (queryKind.getSelectionIndex() != currentQueryKind) {
+					for (Control childControl : queryComposite.getChildren()) {
+						childControl.dispose();
+					}
+
+					if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
+						createTextSearch();
+					} else {
+						if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
+
+							ScopeEntry currentScope = getCurrentScopeEntry();
+							if (currentScope != null) {
+								if (currentScope.getModelSet() != null) {
+
+									try {
+										EObject root = ((UmlModel) currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
+										createOCLSearch(root);
+
+										if (contextObject instanceof NamedElement) {
+											oclContext.setText(((NamedElement) contextObject).getQualifiedName());
+										} else {
+											LabelProviderService labelProviderService = new LabelProviderServiceImpl();
+											ILabelProvider labelProvider = labelProviderService.getLabelProvider();
+											oclContext.setText(labelProvider.getText(contextObject));
+										}
+									} catch (NotFoundException notFoundException) {
+
+										Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException);
+									}
+								} else {
+									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_23, Messages.PapyrusSearchPage_24);
+									createTextSearch();
+									queryKind.select(TEXT_QUERY_KIND);
+								}
+							} else {
+								MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_25, Messages.PapyrusSearchPage_26);
+								createTextSearch();
+								queryKind.select(TEXT_QUERY_KIND);
+							}
+						} else {
+							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
+							createTextSearch();
+							queryKind.select(TEXT_QUERY_KIND);
+						}
+					}
+					queryComposite.layout();
+				}
+			}
+		});
+
+
+		queryComposite = new Composite(searchComposite, SWT.NONE);
+		queryComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+		queryComposite.setLayout(new GridLayout(1, false));
+
+		createTextSearch();
+
+		setControl(parent);
+	}
+
+	public boolean getSearchAllStringAttributes() {
+		if (btnSearchAllStringAttributes != null) {
+			return btnSearchAllStringAttributes.getSelection();
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Validate syntax of the regular expression of the search query text.
+	 *
+	 * @return true, if successful
+	 */
+	private boolean validateRegex() {
+
+		try {
+			PatternHelper.getInstance().createPattern(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection());
+			searchQueryExplanatoryLabel.setForeground(getControl().getForeground());
+			searchQueryExplanatoryLabel.setText(""); //$NON-NLS-1$
+			return true;
+
+		} catch (PatternSyntaxException e) {
+			searchQueryExplanatoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
+			searchQueryExplanatoryLabel.setText(e.getDescription());
+
+			return false;
+		}
+	}
+
+	protected void refreshSelection(final Object selected) {
+		final BaseDocument editorDocument = (BaseDocument) oclEditor.getDocument();
+		editorDocument.modify(new IUnitOfWork<Object, XtextResource>() {
+
+			public Value exec(XtextResource resource) throws Exception {
+				Object selectedObject = selected;
+				if (selectedObject instanceof IOutlineNode) {
+					if (selectedObject instanceof EObjectNode) {
+						EObjectNode selectedObjectNode = (EObjectNode) selectedObject;
+						selectedObjectNode.getEObjectURI();
+						contextObject = null; // FIXME
+												// metamodelManager.loadResource(eObjectURI,
+												// null, null);
+					} else if (selectedObject instanceof EStructuralFeatureNode) {
+						contextObject = null;
+					} else {
+						contextObject = null;
+					}
+				} else {
+					if (selectedObject instanceof IAdaptable) {
+						selectedObject = ((IAdaptable) selectedObject).getAdapter(EObject.class);
+					}
+					if (selectedObject instanceof EObject) {
+						contextObject = (EObject) selectedObject;
+					} else {
+						contextObject = null;
+					}
+				}
+				EnvironmentFactory environmentFactory = getEnvironmentFactory();
+				parserContext = new EObjectContext(environmentFactory, null, contextObject);
+				EssentialOCLCSResource csResource = (EssentialOCLCSResource) resource;
+				if (csResource != null) {
+					if (contextObject != null) {
+						csResource.getCS2AS();			// FIXME redundant ??
+					}
+					ResourceSet resourceSet = oclEditor.getResourceSet();
+					if (resourceSet != null) {
+						environmentFactory.adapt(resourceSet);			// FIXME redundant ??
+					}
+					csResource.setParserContext(parserContext);
+				}
+
+				return null;
+			}
+		});
+	}
+
+
+	@SuppressWarnings("unused")
+	private Collection<ScopeEntry> createScopeEntries(Collection<URI> scope) {
+		Collection<ScopeEntry> results = new HashSet<ScopeEntry>();
+
+		for (URI resource : scope) {
+
+			ScopeEntry scopeEntry = new ScopeEntry(resource);
+
+			results.add(scopeEntry);
+
+		}
+
+		return results;
+	}
+
+	@SuppressWarnings("unused")
+	private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) {
+		List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
+
+		for (ParticipantTypeElement element : participantsList.keySet()) {
+			if (element.isChecked()) {
+				participantsToEvaluate.add(element);
+				for (ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
+					if (attributesToEvaluate.isChecked()) {
+						participantsToEvaluate.add(attributesToEvaluate);
+					}
+				}
+			}
+		}
+		return participantsToEvaluate;
+	}
+
+	public boolean performAction() {
+
+		if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
+			if (validateRegex()) {
+				Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
+				AbstractPapyrusQuery compositeQuery;
+				if (searchKind.getSelectionIndex() == SIMPLE_SEARCH) {
+					if (searchQueryText.getText().length() == 0) {
+						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_29, Messages.PapyrusSearchPage_30);
+						return false;
+					} else {
+						// One query per di file to avoid one single slow query on many files
+						ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size());
+						
+						for (URI uri : scope) {
+							Collection<URI> singleScope = new HashSet<URI>();
+							singleScope.add(uri);
+							
+							QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), singleScope);
+							ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info);
+							
+							queries.add((AbstractPapyrusQuery) query);
+						}
+						
+						compositeQuery = CompositePapyrusQuery.compose(queries);
+					}
+				} else {
+
+
+					List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
+					
+					for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
+						if (element.isChecked()) {
+							participantsToEvaluate.add(element);
+							
+							if (searchQueryText.getText().length() > 0) {
+								for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
+									if (attributesToEvaluate.isChecked()) {
+										participantsToEvaluate.add(attributesToEvaluate);
+									}
+								}
+							}
+						}
+					}
+					
+					for (ParticipantTypeElement element : this.stereotypeParticipantsList.keySet()) {
+						if (element.isChecked()) {
+							participantsToEvaluate.add(element);
+							
+							if (searchQueryText.getText().length() > 0) {
+								for (ParticipantTypeAttribute attributesToEvaluate : stereotypeParticipantsList.get(element)) {
+									if (attributesToEvaluate.isChecked()) {
+										participantsToEvaluate.add(attributesToEvaluate);
+									}
+								}
+							}
+						}
+					}
+					
+					if (participantsToEvaluate.size() == 0) {
+						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_31, Messages.PapyrusSearchPage_32);
+						return false;
+					} else {
+						// One query per di file to avoid one single slow query on many files
+						ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size());
+						
+						for (URI uri : scope) {
+							Collection<URI> singleScope = new HashSet<URI>();
+							singleScope.add(uri);
+							
+							QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, singleScope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection());
+							ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
+							
+							queries.add((AbstractPapyrusQuery) query);
+						}
+						
+						compositeQuery = CompositePapyrusQuery.compose(queries);
+					}
+
+				}
+				if (compositeQuery.canRunInBackground()) {
+					NewSearchUI.runQueryInBackground(compositeQuery);
+				}
+
+				return true;
+			} else {
+				MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, REGULAR_EXPRESSION_ILLFORMED);
+				return false;
+			}
+		} else {
+
+			ScopeEntry scopeEntry = getCurrentScopeEntry();
+
+			if (scopeEntry != null) {
+
+				try {
+
+					PivotUtil.checkResourceErrors("", oclEditor.getResource()); //$NON-NLS-1$
+					@SuppressWarnings("unused") ExpressionInOCL expressionInOCL = parserContext.getExpression((CSResource) oclEditor.getResource());
+					ISearchQuery query = new PapyrusOCLQuery((BaseDocument) oclEditor.getDocument(), parserContext, getEnvironmentFactory(), null, contextObject, scopeEntry);
+
+
+					if (query.canRunInBackground()) {
+						NewSearchUI.runQueryInBackground(query);
+					}
+				} catch (ParserException e) {
+					@SuppressWarnings("unused") Object value = new InvalidValueException(e, Messages.PapyrusSearchPage_35);
+					MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, OCL_QUERY_ILLFORMED);
+					return false;
+				}
+
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
+
+	public void setContainer(ISearchPageContainer container) {
+		this.container = container;
+		this.container.setPerformActionEnabled(true);
+	}
+
+	public boolean performReplace() {
+		if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
+			if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {
+				if (validateRegex()) {
+					if (searchQueryText.getText().length() == 0) {
+						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_36, Messages.PapyrusSearchPage_37);
+						return false;
+					}
+
+					Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container);
+
+					AbstractPapyrusQuery query;
+					if (searchKind.getSelectionIndex() == SIMPLE_SEARCH) {
+						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), scope);
+						query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info);
+					} else {
+						List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
+						for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) {
+							if (element.isChecked()) {
+								participantsToEvaluate.add(element);
+								if (umlTypeParticipantsList.get(element).size() == 0) {
+									MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_38, Messages.PapyrusSearchPage_39);
+									return false;
+
+								} else {
+									for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) {
+										if (attributesToEvaluate.isChecked()) {
+											participantsToEvaluate.add(attributesToEvaluate);
+											boolean canDoReplace = false;
+											if (attributesToEvaluate.getElement() instanceof EAttribute) {
+												Object value = element.getElement().eGet((EAttribute) attributesToEvaluate.getElement());
+												if (value instanceof String) {
+													canDoReplace = true;
+												}
+											} else if (attributesToEvaluate.getElement() instanceof Property) {
+												Property property = (Property) attributesToEvaluate.getElement();
+												if (UMLUtil.isString(property.getType())) {
+													canDoReplace = true;
+												}
+											}
+											if (!canDoReplace) {
+												MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_40, Messages.PapyrusSearchPage_41);
+												return false;
+											}
+										}
+									}
+								}
+							}
+						}
+						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection());
+						query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
+
+					}
+
+					NewSearchUI.runQueryInForeground(container.getRunnableContext(), query);
+
+
+					Display.getCurrent().syncExec(new Runnable() {
+
+						public void run() {
+							ISearchResultViewPart view = NewSearchUI.activateSearchResultView();
+							if (view != null) {
+								ISearchResultPage page = view.getActivePage();
+
+								if (page instanceof PapyrusSearchResultPage) {
+									PapyrusSearchResultPage resultPage = (PapyrusSearchResultPage) page;
+									ReplaceAction replaceAction = new ReplaceAction(resultPage.getSite().getShell(), resultPage, null);
+									replaceAction.run();
+								}
+							}
+						}
+					});
+
+					NewSearchUI.removeQuery(query);
+					return true;
+				} else {
+					MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, REGULAR_EXPRESSION_ILLFORMED);
+					return false;
+				}
+			} else {
+				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);
+				return false;
+			}
+		} else {
+			MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_42, Messages.PapyrusSearchPage_43);
+			return false;
+		}
+
+	}
+
+	protected EnvironmentFactory getEnvironmentFactory() {
+		return oclEditor.getOCL().getEnvironmentFactory();
+	}
+
+	protected void flushEvents() {
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		while (workbench.getDisplay().readAndDispatch()) {
+			;
+		}
+	}
+
+	public void reset() {
+		if (oclEditor != null) {
+			flushEvents();
+			// editor.close(false);
+			flushEvents();
+		}
+		parserContext = null;
+		contextObject = null;
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java
index 6be11b142de..3533452ba4d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java
@@ -1,190 +1,191 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * 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.uml.search.ui.pages;
-
-import java.util.Set;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;
-import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;
-import org.eclipse.papyrus.uml.search.ui.Activator;
-import org.eclipse.papyrus.uml.search.ui.Messages;
-import org.eclipse.papyrus.uml.search.ui.actions.FilterTypesAction;
-import org.eclipse.papyrus.uml.search.ui.providers.ResultContentProvider;
-import org.eclipse.papyrus.uml.search.ui.providers.ResultLabelProvider;
-import org.eclipse.papyrus.views.search.results.AbstractResultEntry;
-import org.eclipse.papyrus.views.search.results.ModelMatch;
-import org.eclipse.papyrus.views.search.results.ResultEntry;
-import org.eclipse.papyrus.views.search.scope.ScopeEntry;
-import org.eclipse.papyrus.views.search.utils.MatchUtils;
-import org.eclipse.search.ui.IContextMenuConstants;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.uml2.uml.Element;
-
-/**
- *
- * Papyrus specific search results page
- *
- */
-public class PapyrusSearchResultPage extends AbstractTextSearchViewPage {
-
-	ResultContentProvider fContentProvider = null;
-
-	private IAction fFiltertypesAction = null;
-
-	private static final int DEFAULT_ELEMENT_LIMIT = 1000;
-
-	public PapyrusSearchResultPage() {
-
-		super(FLAG_LAYOUT_TREE);
-		setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT));
-		fFiltertypesAction = new FilterTypesAction(this);
-	}
-
-
-
-	@Override
-	public Match[] getDisplayedMatches(Object element) {
-		
-		Set<AbstractResultEntry> results = MatchUtils.getMatches(this.getInput(), true);
-
-		if (element instanceof AbstractResultEntry) {
-			AbstractResultEntry resultEntry = (AbstractResultEntry) element;
-
-			if (results.contains(resultEntry)) {
-
-				return new Match[] { resultEntry };
-
-			}
-			return new Match[0];
-		} else {
-			return super.getDisplayedMatches(element);
-		}
-	}
-
-	@Override
-	public int getDisplayedMatchCount(Object element) {
-
-		if (element instanceof AbstractResultEntry) {
-			AbstractResultEntry resultEntry = (AbstractResultEntry) element;
-
-			Set<AbstractResultEntry> results = MatchUtils.getMatches(this.getInput(), true);
-			if (results.contains(resultEntry)) {
-				return 1;
-			}
-
-			return 0;
-		} else {
-			return super.getDisplayedMatchCount(element);
-		}
-	}
-
-	@Override
-	protected void fillToolbar(IToolBarManager tbm) {
-		super.fillToolbar(tbm);
-		tbm.appendToGroup(IContextMenuConstants.GROUP_REMOVE_MATCHES, fFiltertypesAction);
-	}
-
-	@Override
-	protected void handleOpen(OpenEvent event) {
-		ISelection selection = event.getSelection();
-		if (!selection.isEmpty()) {
-			if (selection instanceof IStructuredSelection) {
-				Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-
-				if (firstElement instanceof AbstractResultEntry) {
-					AbstractResultEntry resultEntry = (AbstractResultEntry) firstElement;
-					ScopeEntry scopeEntry = (ScopeEntry) resultEntry.getElement();
-					if (scopeEntry != null && scopeEntry.getServicesRegistry() != null) {
-						Object source = resultEntry.getSource();
-						if (source instanceof Element) { // UML element => use NavigationService to navigate to Model Explorer
-							try {
-								NavigationService navigationService = ServiceUtilsForEObject.getInstance().getService(NavigationService.class, (Element) source);
-								navigationService.navigate((Element) source, "org.eclipse.papyrus.views.modelexplorer.navigation.target");
-							} catch (ServiceException e) {
-								Activator.log.error(e);
-							}
-						} else { // Anything else => Let the OpenElementService handle it
-							try {
-								OpenElementService service = scopeEntry.getServicesRegistry().getService(OpenElementService.class);
-								resultEntry.openElement(service);
-							} catch (ServiceException e) {
-								// Activator.log.error(Messages.PapyrusSearchResultPage_0 + resultEntry.elementToOpen(), e);
-							} catch (PartInitException e) {
-								Activator.log.error(Messages.PapyrusSearchResultPage_1, e);
-							}
-						}
-					}
-
-				}
-
-			}
-
-		}
-
-		// super.handleOpen(event);
-	}
-
-	@Override
-	protected void elementsChanged(Object[] objects) {
-		if (fContentProvider != null) {
-			fContentProvider.elementsChanged(objects);
-		}
-	}
-
-
-	@SuppressWarnings("unchecked")
-	@Override
-	protected void evaluateChangedElements(Match[] matches, @SuppressWarnings("rawtypes") Set changedElements) {
-		for (int i = 0; i < matches.length; i++) {
-			changedElements.add(matches[i]);
-		}
-	}
-
-	@Override
-	protected void clear() {
-		if (fContentProvider != null) {
-			fContentProvider.clear();
-		}
-	}
-
-	@Override
-	protected void configureTreeViewer(TreeViewer viewer) {
-		viewer.setContentProvider(new ResultContentProvider(this, viewer));
-		viewer.setLabelProvider(new ResultLabelProvider());
-		fContentProvider = (ResultContentProvider) viewer.getContentProvider();
-
-	}
-
-	@Override
-	protected void configureTableViewer(TableViewer viewer) {
-
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * 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.uml.search.ui.pages;
+
+import java.util.Set;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.OpenEvent;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.services.navigation.service.NavigationService;
+import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;
+import org.eclipse.papyrus.uml.search.ui.Activator;
+import org.eclipse.papyrus.uml.search.ui.Messages;
+import org.eclipse.papyrus.uml.search.ui.actions.FilterTypesAction;
+import org.eclipse.papyrus.uml.search.ui.providers.ResultContentProvider;
+import org.eclipse.papyrus.uml.search.ui.providers.ResultLabelProvider;
+import org.eclipse.papyrus.views.search.results.AbstractResultEntry;
+import org.eclipse.papyrus.views.search.results.ModelMatch;
+import org.eclipse.papyrus.views.search.results.ResultEntry;
+import org.eclipse.papyrus.views.search.scope.ScopeEntry;
+import org.eclipse.papyrus.views.search.utils.MatchUtils;
+import org.eclipse.search.ui.IContextMenuConstants;
+import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
+import org.eclipse.search.ui.text.Match;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Element;
+
+/**
+ *
+ * Papyrus specific search results page
+ * @since 2.0
+ *
+ */
+public class PapyrusSearchResultPage extends AbstractTextSearchViewPage {
+
+	ResultContentProvider fContentProvider = null;
+
+	private IAction fFiltertypesAction = null;
+
+	private static final int DEFAULT_ELEMENT_LIMIT = 1000;
+
+	public PapyrusSearchResultPage() {
+
+		super(FLAG_LAYOUT_TREE);
+		setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT));
+		fFiltertypesAction = new FilterTypesAction(this);
+	}
+
+
+
+	@Override
+	public Match[] getDisplayedMatches(Object element) {
+		
+		Set<AbstractResultEntry> results = MatchUtils.getMatches(this.getInput(), true);
+
+		if (element instanceof AbstractResultEntry) {
+			AbstractResultEntry resultEntry = (AbstractResultEntry) element;
+
+			if (results.contains(resultEntry)) {
+
+				return new Match[] { resultEntry };
+
+			}
+			return new Match[0];
+		} else {
+			return super.getDisplayedMatches(element);
+		}
+	}
+
+	@Override
+	public int getDisplayedMatchCount(Object element) {
+
+		if (element instanceof AbstractResultEntry) {
+			AbstractResultEntry resultEntry = (AbstractResultEntry) element;
+
+			Set<AbstractResultEntry> results = MatchUtils.getMatches(this.getInput(), true);
+			if (results.contains(resultEntry)) {
+				return 1;
+			}
+
+			return 0;
+		} else {
+			return super.getDisplayedMatchCount(element);
+		}
+	}
+
+	@Override
+	protected void fillToolbar(IToolBarManager tbm) {
+		super.fillToolbar(tbm);
+		tbm.appendToGroup(IContextMenuConstants.GROUP_REMOVE_MATCHES, fFiltertypesAction);
+	}
+
+	@Override
+	protected void handleOpen(OpenEvent event) {
+		ISelection selection = event.getSelection();
+		if (!selection.isEmpty()) {
+			if (selection instanceof IStructuredSelection) {
+				Object firstElement = ((IStructuredSelection) selection).getFirstElement();
+
+				if (firstElement instanceof AbstractResultEntry) {
+					AbstractResultEntry resultEntry = (AbstractResultEntry) firstElement;
+					ScopeEntry scopeEntry = (ScopeEntry) resultEntry.getElement();
+					if (scopeEntry != null && scopeEntry.getServicesRegistry() != null) {
+						Object source = resultEntry.getSource();
+						if (source instanceof Element) { // UML element => use NavigationService to navigate to Model Explorer
+							try {
+								NavigationService navigationService = ServiceUtilsForEObject.getInstance().getService(NavigationService.class, (Element) source);
+								navigationService.navigate((Element) source, "org.eclipse.papyrus.views.modelexplorer.navigation.target");
+							} catch (ServiceException e) {
+								Activator.log.error(e);
+							}
+						} else { // Anything else => Let the OpenElementService handle it
+							try {
+								OpenElementService service = scopeEntry.getServicesRegistry().getService(OpenElementService.class);
+								resultEntry.openElement(service);
+							} catch (ServiceException e) {
+								// Activator.log.error(Messages.PapyrusSearchResultPage_0 + resultEntry.elementToOpen(), e);
+							} catch (PartInitException e) {
+								Activator.log.error(Messages.PapyrusSearchResultPage_1, e);
+							}
+						}
+					}
+
+				}
+
+			}
+
+		}
+
+		// super.handleOpen(event);
+	}
+
+	@Override
+	protected void elementsChanged(Object[] objects) {
+		if (fContentProvider != null) {
+			fContentProvider.elementsChanged(objects);
+		}
+	}
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void evaluateChangedElements(Match[] matches, @SuppressWarnings("rawtypes") Set changedElements) {
+		for (int i = 0; i < matches.length; i++) {
+			changedElements.add(matches[i]);
+		}
+	}
+
+	@Override
+	protected void clear() {
+		if (fContentProvider != null) {
+			fContentProvider.clear();
+		}
+	}
+
+	@Override
+	protected void configureTreeViewer(TreeViewer viewer) {
+		viewer.setContentProvider(new ResultContentProvider(this, viewer));
+		viewer.setLabelProvider(new ResultLabelProvider());
+		fContentProvider = (ResultContentProvider) viewer.getContentProvider();
+
+	}
+
+	@Override
+	protected void configureTableViewer(TableViewer viewer) {
+
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java
index 4c92d0572f6..6a6337df6d6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/CombinedFragmentDestroyCommand.java
@@ -24,6 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 
 
+/**
+ * @since 3.0
+ */
 public class CombinedFragmentDestroyCommand extends AbstractTransactionalCommand {
 
 	private IElementEditService provider;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java
index 3a6423e674e..1c6376b4644 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/MoveOperandFragmentsCommand.java
@@ -27,6 +27,7 @@ import org.eclipse.uml2.uml.InteractionOperand;
 
 /**
  * Command to move Operand fragments.
+ * @since 3.0
  */
 public class MoveOperandFragmentsCommand extends EditElementCommand {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java
index d9002aace14..4fff26e3b8d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SelectAndDeleteCommand.java
@@ -29,6 +29,7 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * Select and delete pops up menu command.
+ * @since 3.0
  */
 public class SelectAndDeleteCommand extends PopupMenuCommand {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java
index c69cd99d2e2..0ede05bd788 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/SetMessageSort.java
@@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.MessageSort;
 
 /**
  * {@link EditElementCommand} to set {@link MessageSort}.
+ * @since 3.0
  */
 public class SetMessageSort extends EditElementCommand {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java
index 47b58a9b097..a7c49af0dc3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/BehaviorExecutionSpecificationEditHelper.java
@@ -13,6 +13,9 @@
 
 package org.eclipse.papyrus.uml.service.types.helper;
 
+/**
+ * @since 3.0
+ */
 public class BehaviorExecutionSpecificationEditHelper extends ExecutionSpecificationEditHelper {
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java
index 1a475663daa..98fdd9dea55 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/CombinedFragmentEditHelper.java
@@ -16,25 +16,17 @@ package org.eclipse.papyrus.uml.service.types.helper;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.command.CombinedFragmentDestroyCommand;
-import org.eclipse.papyrus.uml.service.types.command.MoveOperandFragmentsCommand;
-import org.eclipse.papyrus.uml.service.types.command.SelectAndDeleteCommand;
-import org.eclipse.papyrus.uml.service.types.request.MoveOperandFragmentEditRequest;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.uml2.uml.CombinedFragment;
-import org.eclipse.uml2.uml.InteractionOperand;
-import org.eclipse.uml2.uml.UMLFactory;
 
+/**
+ * @since 3.0
+ */
 public class CombinedFragmentEditHelper extends ElementEditHelper {
 
 	/**
@@ -67,34 +59,34 @@ public class CombinedFragmentEditHelper extends ElementEditHelper {
 	@Override
 	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {
 		return super.getDestroyElementCommand(req);
-//		EObject elementToDestroy = req.getElementToDestroy();
-//		if (elementToDestroy instanceof CombinedFragment) {
-//			CombinedFragment combinedFragment = (CombinedFragment) elementToDestroy;
-//			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
-//			if (provider != null) {
-//				// Retrieve delete command from the Element Edit service
-//				ICommand deleteCommand = super.getDestroyElementCommand(req);
-////				if (deleteCommand != null) {
-////					if (elementToDestroy instanceof CombinedFragment) {
-////
-////						CompositeCommand deleteAll = new CompositeCommand(req.getLabel());
-////						deleteAll.add(deleteCommand);
-////						CompositeCommand deleteCfOnly = new CompositeCommand(req.getLabel());
-////
-////						// remove children from operands and append to parent combined fragment
-////						for (InteractionOperand op : combinedFragment.getOperands()) {
-////							deleteCfOnly.add(new MoveOperandFragmentsCommand(combinedFragment, op, new MoveOperandFragmentEditRequest(req.getEditingDomain(), combinedFragment)));
-////						}
-////						deleteCfOnly.add(new CombinedFragmentDestroyCommand(req.getEditingDomain(), provider, req));
-////
-////						return new SelectAndDeleteCommand(deleteAll, deleteCfOnly, new String[] { "Delete all", "Keep contents" });
-////					} else {
-//						return deleteCommand;
-////					}
-////				}
-//			}
-//		}
-//		return UnexecutableCommand.INSTANCE;
+		// EObject elementToDestroy = req.getElementToDestroy();
+		// if (elementToDestroy instanceof CombinedFragment) {
+		// CombinedFragment combinedFragment = (CombinedFragment) elementToDestroy;
+		// IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToDestroy);
+		// if (provider != null) {
+		// // Retrieve delete command from the Element Edit service
+		// ICommand deleteCommand = super.getDestroyElementCommand(req);
+		//// if (deleteCommand != null) {
+		//// if (elementToDestroy instanceof CombinedFragment) {
+		////
+		//// CompositeCommand deleteAll = new CompositeCommand(req.getLabel());
+		//// deleteAll.add(deleteCommand);
+		//// CompositeCommand deleteCfOnly = new CompositeCommand(req.getLabel());
+		////
+		//// // remove children from operands and append to parent combined fragment
+		//// for (InteractionOperand op : combinedFragment.getOperands()) {
+		//// deleteCfOnly.add(new MoveOperandFragmentsCommand(combinedFragment, op, new MoveOperandFragmentEditRequest(req.getEditingDomain(), combinedFragment)));
+		//// }
+		//// deleteCfOnly.add(new CombinedFragmentDestroyCommand(req.getEditingDomain(), provider, req));
+		////
+		//// return new SelectAndDeleteCommand(deleteAll, deleteCfOnly, new String[] { "Delete all", "Keep contents" });
+		//// } else {
+		// return deleteCommand;
+		//// }
+		//// }
+		// }
+		// }
+		// return UnexecutableCommand.INSTANCE;
 
 
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java
index 795e4ddd6db..73ed519aa9a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ConsiderIgnoreFragmentEditHelper.java
@@ -24,6 +24,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
 import org.eclipse.uml2.uml.InteractionOperatorKind;
 
+/**
+ * @since 3.0
+ */
 public class ConsiderIgnoreFragmentEditHelper extends CombinedFragmentEditHelper {
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java
index e50f342d91b..6ffe1b6bb2a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExecutionSpecificationEditHelper.java
@@ -17,25 +17,16 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.ExecutionOccurrenceSpecification;
 import org.eclipse.uml2.uml.ExecutionSpecification;
 import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.InteractionFragment;
@@ -44,13 +35,15 @@ import org.eclipse.uml2.uml.Lifeline;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
 import org.eclipse.uml2.uml.OccurrenceSpecification;
-import org.eclipse.uml2.uml.UMLFactory;
 
+/**
+ * @since 3.0
+ */
 public abstract class ExecutionSpecificationEditHelper extends ElementEditHelper {
 
 
 
-	
+
 
 	/**
 	 * @see org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper#getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest)
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java
index 621a588c5e8..bd0f006d7a5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionEditHelper.java
@@ -16,6 +16,9 @@ package org.eclipse.papyrus.uml.service.types.helper;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
 
+/**
+ * @since 3.0
+ */
 public class InteractionEditHelper extends ElementEditHelper {
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java
index a29abbdacce..263ea538c80 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/InteractionOperandEditHelper.java
@@ -21,15 +21,11 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.uml2.uml.CombinedFragment;
 import org.eclipse.uml2.uml.InteractionConstraint;
 import org.eclipse.uml2.uml.InteractionOperand;
 
 /**
- * @author PT202707
- *
+ * @since 3.0
  */
 public class InteractionOperandEditHelper extends ElementEditHelper {
 
@@ -46,7 +42,7 @@ public class InteractionOperandEditHelper extends ElementEditHelper {
 
 			protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 				InteractionOperand interactionOperand = (InteractionOperand) req.getElementToConfigure();
-				InteractionConstraint guard= interactionOperand.createGuard("guard");
+				InteractionConstraint guard = interactionOperand.createGuard("guard");
 				return CommandResult.newOKCommandResult(interactionOperand);
 			}
 		};
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
index 0c0b4e7a7a4..3c9dda9d867 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
@@ -32,6 +32,9 @@ import org.eclipse.uml2.uml.InteractionOperand;
 import org.eclipse.uml2.uml.Lifeline;
 import org.eclipse.uml2.uml.UMLPackage;
 
+/**
+ * @since 3.0
+ */
 public class LifelineEditHelper extends ElementEditHelper {
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
index 3d8ee57d42f..f55d5282e01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractReferenceDeleteRelationshipEditHelperAdvice.java
@@ -66,6 +66,7 @@ public abstract class AbstractReferenceDeleteRelationshipEditHelperAdvice extend
 	 *            the visual id
 	 * @return
 	 * 		the EReference represented by the view with this visual id
+	 * @since 3.0
 	 */
 	protected EReference getFeature(String visualId, IClientContext context) {
 		List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(visualId, context.getId());
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
index 2c8119e2a7d..1eab5948d2e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeDirectedEditHelperAdvice.java
@@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Association Composite Directed edit helper advice.
+ * 
+ * @since 3.0
  */
 public class AssociationCompositeDirectedEditHelperAdvice extends AssociationCompositeEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
index c7a5610d7d9..79707ebf3a4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationCompositeEditHelperAdvice.java
@@ -18,6 +18,8 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Association Composite edit helper advice.
+ * 
+ * @since 3.0
  */
 public class AssociationCompositeEditHelperAdvice extends AssociationEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java
index ec3ac20d927..f52c8867f7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationDirectedEditHelperAdvice.java
@@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Association Directed edit helper advice.
+ * 
+ * @since 3.0
  */
 public class AssociationDirectedEditHelperAdvice extends AssociationEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
index 5ff532a4722..ca5ff2ed081 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationEditHelperAdvice.java
@@ -126,6 +126,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 *
 	 * @param sourceProperty
 	 *            The property to configure.
+	 * @since 3.0
 	 */
 	protected void configureSourceProperty(Property sourceProperty) {
 		// do nothing
@@ -136,6 +137,7 @@ public class AssociationEditHelperAdvice extends AbstractEditHelperAdvice {
 	 *
 	 * @param targetProperty
 	 *            The property to configure.
+	 * @since 3.0
 	 */
 	protected void configureTargetProperty(Property targetProperty) {
 		// do nothing
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
index d8dd9258485..9461540f41c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedDirectedEditHelperAdvice.java
@@ -19,6 +19,8 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Association Shared Directed edit helper advice.
+ * 
+ * @since 3.0
  */
 public class AssociationSharedDirectedEditHelperAdvice extends AssociationSharedEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
index de546a5498d..88188bc8197 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AssociationSharedEditHelperAdvice.java
@@ -18,6 +18,8 @@ import org.eclipse.uml2.uml.Property;
 
 /**
  * Association Composite edit helper advice.
+ * 
+ * @since 3.0
  */
 public class AssociationSharedEditHelperAdvice extends AssociationEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
index 150c61b9377..738dd55c6a6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.DurationInterval;
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
- * @author C�line JANSSENS
+ * @since 3.0
  *
  */
 public class DurationConstraintEditHelperAdvice extends AbstractEditHelperAdvice {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java
index 31d97405fc7..5dad8b9a50c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ElementHelperAdvice.java
@@ -20,6 +20,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
  * <pre>
  * This HelperAdvice prohibits the move command of elements into a proxy element.
  * </pre>
+ * @since 3.0
  */
 public class ElementHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
index ba72f5e13ea..8fa91f44524 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/ExecutionSpecificationHelperAdvice.java
@@ -26,7 +26,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
@@ -34,18 +33,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.uml.diagram.common.helper.InteractionFragmentHelper;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.utils.ElementUtil;
 import org.eclipse.papyrus.uml.service.types.utils.SequenceRequestConstant;
 import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.ExecutionOccurrenceSpecification;
 import org.eclipse.uml2.uml.ExecutionSpecification;
 import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.InteractionFragment;
 import org.eclipse.uml2.uml.Lifeline;
 import org.eclipse.uml2.uml.Message;
-import org.eclipse.uml2.uml.MessageEnd;
 import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
 import org.eclipse.uml2.uml.MessageSort;
 import org.eclipse.uml2.uml.OccurrenceSpecification;
@@ -60,13 +55,16 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 	/**
 	 * Create an execution Occurrence
 	 *
-	 * @param execution the execution that references the execution occurrences  always !=null
-	 * @param lifeline the lifeLine that is covered by the execution occurrences ,always !=null
+	 * @param execution
+	 *            the execution that references the execution occurrences always !=null
+	 * @param lifeline
+	 *            the lifeLine that is covered by the execution occurrences ,always !=null
+	 * @since 3.0
 	 */
 	public static ExecutionOccurrenceSpecification createOccurenceSpecification(ExecutionSpecification execution, Lifeline lifeline) {
-		ExecutionOccurrenceSpecification occurrenceSpecification=UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification();
+		ExecutionOccurrenceSpecification occurrenceSpecification = UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification();
 		occurrenceSpecification.setCovered(lifeline);
-		((Interaction)execution.getOwner()).getFragments().add(occurrenceSpecification);
+		((Interaction) execution.getOwner()).getFragments().add(occurrenceSpecification);
 		return occurrenceSpecification;
 	}
 
@@ -98,29 +96,27 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 
 				final ExecutionSpecification execution = (ExecutionSpecification) request.getElementToConfigure();
 
-				Object replaceStart= request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_START);
-				if(replaceStart instanceof MessageOccurrenceSpecification ){
-					execution.setStart((MessageOccurrenceSpecification)replaceStart);
-				}
-				else{
-					//create Occurrence SpecStart
-					ExecutionOccurrenceSpecification start=createOccurenceSpecification(execution, coveredLifeline);
-					start.setName(execution.getName()+"Start");
+				Object replaceStart = request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_START);
+				if (replaceStart instanceof MessageOccurrenceSpecification) {
+					execution.setStart((MessageOccurrenceSpecification) replaceStart);
+				} else {
+					// create Occurrence SpecStart
+					ExecutionOccurrenceSpecification start = createOccurenceSpecification(execution, coveredLifeline);
+					start.setName(execution.getName() + "Start");
 					start.setExecution(execution);
 					execution.setStart(start);
 				}
-				//add covered for the execution
+				// add covered for the execution
 				coveredLifeline.getCoveredBys().add(execution);
 				execution.getCovereds().add(coveredLifeline);
 
-				//create Occurrence SpecFinish
-				Object replaceFinish= request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_FINISH);
-				if(replaceFinish instanceof MessageOccurrenceSpecification ){
-					execution.setFinish((MessageOccurrenceSpecification)replaceFinish);
-				}
-				else{
-					ExecutionOccurrenceSpecification finish=createOccurenceSpecification(execution, coveredLifeline);
-					finish.setName(execution.getName()+"Finish");
+				// create Occurrence SpecFinish
+				Object replaceFinish = request.getParameters().get(SequenceRequestConstant.REPLACE_EXECUTION_SPECIFICATION_FINISH);
+				if (replaceFinish instanceof MessageOccurrenceSpecification) {
+					execution.setFinish((MessageOccurrenceSpecification) replaceFinish);
+				} else {
+					ExecutionOccurrenceSpecification finish = createOccurenceSpecification(execution, coveredLifeline);
+					finish.setName(execution.getName() + "Finish");
 					finish.setExecution(execution);
 					execution.setFinish(finish);
 				}
@@ -140,7 +136,7 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
 	 * 
 	 * @param request
-	 *        the request
+	 *            the request
 	 * @return the command to execute before the edit helper work is done
 	 */
 	@Override
@@ -148,16 +144,16 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 
 		List<EObject> dependentsToDestroy = new ArrayList<EObject>();
 
-		ExecutionSpecification es = (ExecutionSpecification)request.getElementToDestroy();
+		ExecutionSpecification es = (ExecutionSpecification) request.getElementToDestroy();
 
 		// Check whether start - finish referenced OccurrenceSpecification should be added to the dependents list
 		OccurrenceSpecification osStart = es.getStart();
-		if(shouldDestroyOccurrenceSpecification(es, osStart)) {
+		if (shouldDestroyOccurrenceSpecification(es, osStart)) {
 			dependentsToDestroy.add(osStart);
 		}
 
 		OccurrenceSpecification osFinish = es.getFinish();
-		if(shouldDestroyOccurrenceSpecification(es, osFinish)) {
+		if (shouldDestroyOccurrenceSpecification(es, osFinish)) {
 			dependentsToDestroy.add(osFinish);
 		}
 
@@ -165,12 +161,12 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 
 		// find initiating MOS of a synch message
 		InteractionFragment previousIft = InteractionFragmentHelper.findPreviousFragment(osStart, es.getOwner());
-		while(previousIft != null) {
+		while (previousIft != null) {
 			// keep the first ift with the same lifelines, and check it
-			if(coveredLifelines.equals(new HashSet<Lifeline>(previousIft.getCovereds()))) {
-				if(previousIft instanceof MessageOccurrenceSpecification) {
-					Message msg = ((MessageOccurrenceSpecification)previousIft).getMessage();
-					if(msg != null && MessageSort.SYNCH_CALL_LITERAL.equals(msg.getMessageSort())) {
+			if (coveredLifelines.equals(new HashSet<Lifeline>(previousIft.getCovereds()))) {
+				if (previousIft instanceof MessageOccurrenceSpecification) {
+					Message msg = ((MessageOccurrenceSpecification) previousIft).getMessage();
+					if (msg != null && MessageSort.SYNCH_CALL_LITERAL.equals(msg.getMessageSort())) {
 						dependentsToDestroy.add(previousIft);
 					}
 				}
@@ -181,9 +177,9 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 
 		// find MOS between the start and finish
 		InteractionFragment fragment = osStart;
-		while(fragment != null && !fragment.equals(osFinish)) {
+		while (fragment != null && !fragment.equals(osFinish)) {
 			// remove MOS if it have the same covered lifelines as the ES
-			if(fragment instanceof MessageOccurrenceSpecification && coveredLifelines.equals(new HashSet<Lifeline>(fragment.getCovereds()))) {
+			if (fragment instanceof MessageOccurrenceSpecification && coveredLifelines.equals(new HashSet<Lifeline>(fragment.getCovereds()))) {
 				dependentsToDestroy.add(fragment);
 			}
 
@@ -191,7 +187,7 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 		}
 
 		// return command to destroy dependents
-		if(!dependentsToDestroy.isEmpty()) {
+		if (!dependentsToDestroy.isEmpty()) {
 			return request.getDestroyDependentsCommand(dependentsToDestroy);
 		}
 
@@ -209,10 +205,10 @@ public class ExecutionSpecificationHelperAdvice extends AbstractEditHelperAdvice
 	 * </pre>
 	 * 
 	 * @param es
-	 *        {@link ExecutionSpecification} which references {@link OccurrenceSpecification} (by means of #start/#finish references)
+	 *            {@link ExecutionSpecification} which references {@link OccurrenceSpecification} (by means of #start/#finish references)
 	 * @param os
-	 *        start or finish {@link OccurrenceSpecification} which defines the duration of {@link ExecutionSpecification}
-	 * @return true in case {@link OccurrenceSpecification} should be destroyed 
+	 *            start or finish {@link OccurrenceSpecification} which defines the duration of {@link ExecutionSpecification}
+	 * @return true in case {@link OccurrenceSpecification} should be destroyed
 	 */
 	private boolean shouldDestroyOccurrenceSpecification(ExecutionSpecification es, OccurrenceSpecification os) {
 		return os instanceof ExecutionOccurrenceSpecification
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java
index 8313b1b3463..e93b4e6e1c1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/LifelineHelperAdvice.java
@@ -44,7 +44,8 @@ import org.eclipse.uml2.uml.PartDecomposition;
 public class LifelineHelperAdvice extends AbstractEditHelperAdvice {
 
 
-	/** A request parameter indicating the connectable element that a lifeline represents. */
+	/** A request parameter indicating the connectable element that a lifeline represents. 
+	 * @since 3.0*/
 	public static final String REPRESENTS = "Lifeline::represents"; //$NON-NLS-1$
 
 	/**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java
index f2e1b0e1196..771c13a67d8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/MessageHelperAdvice.java
@@ -342,6 +342,7 @@ public class MessageHelperAdvice extends AbstractEditHelperAdvice {
 	 * @param knownReferencer
 	 *            the known referencer
 	 * @return true if the known referencer is the only referencer.
+	 * @since 3.0
 	 */
 	public static boolean isSharedEvent(MessageEnd usedObject, EObject knownReferencer) {
 		EPackage mmPackage = usedObject.eClass().getEPackage();
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
index 58ba2d6771d..579c82bf073 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/AssociationMatcher.java
@@ -27,6 +27,7 @@ import org.eclipse.uml2.uml.Element;
  * Existing Associations (created in previous Papyrus version and which have no nature set)
  * are treated as UML Associations.
  * </pre>
+ * @since 3.0
  */
 public class AssociationMatcher implements IElementMatcher {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java
index 9fc19e7d01e..e36aed81f62 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/RefineMatcher.java
@@ -17,6 +17,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * Test if current {@link Abstraction} is a {@link Refine}
+ * @since 3.0
  */
 public class RefineMatcher implements IElementMatcher {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java
index bb8b819d572..f9916bc47e3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/matcher/TraceMatcher.java
@@ -17,6 +17,7 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * Test if current {@link Abstraction} is a {@link Trace}
+ * @since 3.0
  */
 public class TraceMatcher implements IElementMatcher {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
index a2807be031b..da0fc650637 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ElementUtil.java
@@ -132,6 +132,7 @@ public class ElementUtil {
 
 	/**
 	 * @return true element is type of type to match
+	 * @since 3.0
 	 */
 	public static boolean isTypeOf(IElementType element, IElementType typeTomatch) {
 		if (typeTomatch.equals(element)) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java
index cd6c0519362..fd87555748c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/MessageUtils.java
@@ -16,7 +16,9 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.uml2.uml.Message;
 
 /**
- * Utility class for {@link Message}. 
+ * Utility class for {@link Message}.
+ * 
+ * @since 3.0
  *
  */
 public class MessageUtils {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java
index 92d09d973da..b82602bf8f3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/SequenceRequestConstant.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.service.types.utils;
 
 /**
  * Constants used in the sequence diagram
+ * @since 3.0
  */
 public interface SequenceRequestConstant {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
index 3b22ab3f5b2..a13e4c61b3f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
@@ -70,6 +70,7 @@ public class Activator extends AbstractUIPlugin {
 	 *
 	 * @param message
 	 *            the message to log
+	 * @since 2.1
 	 */
 	public static void debug(String message) {
 		getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, IStatus.OK, message, null));
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/KeywordObservableValue.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/KeywordObservableValue.java
index 6eb429731d4..a69a6e2b5eb 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/KeywordObservableValue.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/KeywordObservableValue.java
@@ -25,6 +25,7 @@ import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
+ * @since 3.0
  *
  */
 public class KeywordObservableValue extends AbstractObservableValue implements IObserving, ReferenceCountedObservable {
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/UMLLabelObservableValue.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/UMLLabelObservableValue.java
index 796c7b995d5..5cd415e6f9b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/UMLLabelObservableValue.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/UMLLabelObservableValue.java
@@ -34,6 +34,7 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * The observable value for the label of the {@link NamedElement}.
+ * @since 3.0
  */
 @SuppressWarnings("rawtypes")
 public class UMLLabelObservableValue extends AbstractObservableValue implements IObserving, ReferenceCountedObservable {
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileExplorerDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileExplorerDialog.java
index 72d78124326..3769e8b9231 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileExplorerDialog.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/ProfileExplorerDialog.java
@@ -29,6 +29,7 @@ import org.eclipse.uml2.uml.Stereotype;
 
 /**
  * A dialog to explore all available Profiles.
+ * @since 3.0
  */
 public class ProfileExplorerDialog extends StereotypeExplorerDialog {
 
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeQualifyNamePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeQualifyNamePropertyEditor.java
index c7897888a09..51aa8131082 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeQualifyNamePropertyEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeQualifyNamePropertyEditor.java
@@ -25,6 +25,7 @@ import org.eclipse.uml2.uml.UMLFactory;
 
 /**
  * The Stereotype qualify name property Editor.
+ * @since 3.0
  */
 public class StereotypeQualifyNamePropertyEditor extends AbstractPropertyEditor {
 
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
index 144e06b7173..8ed5096f357 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/build.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/build.properties
index 199d8472939..2ba50d93cb5 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/build.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/build.properties
@@ -10,4 +10,3 @@ output..=bin/
 src.includes = about.html
 source..=src/
 bin..=bin/
-additional.bundles = org.eclipse.ocl.jdt.annotation7
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
index 84dff8651c4..36ff7d2a63e 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/pom.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
+\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
index 748faf603cd..d75cee592fd 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext,
  org.eclipse.papyrus.uml.textedit.transition.xtext.validation
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
index dda9e160e06..86dd723121f 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
+\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
index 2fc5c943c0c..496840f2edf 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils,
  org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.commands
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/pom.xml
index c67c85f5cf5..88aba4213e3 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
 \ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
index c01ccfbe5bb..78405ddd2ff 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext,
  org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml
index 2cabd594a1c..95a326e83fc 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml
@@ -7,7 +7,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.textedit.valuespecification.xtext</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<build>
 		<plugins>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
index ac4857301c8..2ecab5f6dec 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
@@ -59,6 +59,7 @@ public class ValueSpecificationUtil {
 	 *
 	 * @param specification The Value specification.
 	 * @param useInternationalization Boolean to determinate if the internationalization must be used for the string representation.
+	 * @since 3.0
 	 */
 	public static String getSpecificationValue(final ValueSpecification specification, final boolean useInternationalization) {
 		String value = ""; //$NON-NLS-1$
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelStylersEnum.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelStylersEnum.java
index a80c548624a..09f6e091441 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelStylersEnum.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelStylersEnum.java
@@ -21,6 +21,7 @@ import org.eclipse.swt.graphics.TextStyle;
 
 /**
  * The Enum of Styler used for UML label customization.
+ * @since 3.0
  */
 public enum LabelStylersEnum {
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelTypesEnum.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelTypesEnum.java
index 60568bed927..198a26f5024 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelTypesEnum.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/profile/definition/LabelTypesEnum.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.tools.profile.definition;
 
 /**
  * the differents type of label that can compose an UML Label.
+ * @since 3.0
  */
 public enum LabelTypesEnum {
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/CustomizableDelegatingItemLabelProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/CustomizableDelegatingItemLabelProvider.java
index 2842662321b..d1c40eb708d 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/CustomizableDelegatingItemLabelProvider.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/CustomizableDelegatingItemLabelProvider.java
@@ -37,6 +37,7 @@ import org.eclipse.uml2.uml.NamedElement;
  * An item label provider that delegates to an adapter factory and rewrites the result for UML element labels.
  * If the adapter factory needs to be disposed (which is usually the case for item-provider factories), then
  * this is the responsibility of the client that creates the delegating label provider.
+ * @since 3.0
  */
 public class CustomizableDelegatingItemLabelProvider implements IItemLabelProvider {
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/GenericDataTypeLabelProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/GenericDataTypeLabelProvider.java
index b431cdcf1b2..12b21b088c3 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/GenericDataTypeLabelProvider.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/GenericDataTypeLabelProvider.java
@@ -39,11 +39,34 @@ import org.eclipse.swt.graphics.Image;
  */
 public class GenericDataTypeLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {
 
+	/**
+	 * @since 3.0
+	 */
 	public static final String SEPARATOR = ","; //$NON-NLS-1$
+	
+	/**
+	 * @since 3.0
+	 */
 	public static final String DATATYPE_START = "("; //$NON-NLS-1$
+	
+	/**
+	 * @since 3.0
+	 */
 	public static final String DATATYPE_END = ")"; //$NON-NLS-1$
+	
+	/**
+	 * @since 3.0
+	 */
 	public static final String COLLECTION_START = "{"; //$NON-NLS-1$
+	
+	/**
+	 * @since 3.0
+	 */
 	public static final String COLLECTION_END = "}"; //$NON-NLS-1$
+	
+	/**
+	 * @since 3.0
+	 */
 	public static final String EQUALS = "="; //$NON-NLS-1$
 
 	/**
@@ -119,6 +142,7 @@ public class GenericDataTypeLabelProvider extends EMFLabelProvider implements IF
 	 *            the object for which we want the label
 	 * @return
 	 * 		the label for the given value
+	 * @since 3.0
 	 */
 	protected String getLabel(final LabelProviderService service, final Object object) {
 		final StringBuilder builder = new StringBuilder();
@@ -156,6 +180,7 @@ public class GenericDataTypeLabelProvider extends EMFLabelProvider implements IF
 	 *            a datatype instance
 	 * @return
 	 * 		the label provider service found or <code>null</code> otherwise
+	 * @since 3.0
 	 */
 	protected LabelProviderService getLabelProviderService(final EObject dataTypeInstance) {
 		ServicesRegistry registry = null;
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLEClassContentProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLEClassContentProvider.java
index dfcb22d7b85..a917488cef3 100755
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLEClassContentProvider.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLEClassContentProvider.java
@@ -23,6 +23,8 @@ import org.eclipse.uml2.uml.UMLPackage;
 
 /**
  * This contents provider provides all UML EClass from UMLPackage
+ * 
+ * @since 3.0
  *
  */
 public class UMLEClassContentProvider implements IStaticContentProvider {
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
index 9b02323a651..dd36294ca11 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
@@ -19,6 +19,7 @@ import org.eclipse.xtext.ui.editor.model.TerminalsTokenTypeToPartitionMapper;
 
 /**
  * The Papyrus default auto edit strategy provider which deny the partition deletion that is not correctly managed in Papyrus XText editor.
+ * @since 2.0
  */
 public class PapyrusDefaultAutoEditStrategyProvider extends DefaultAutoEditStrategyProvider {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Messages.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Messages.java
index 4182d2e342e..e1b8ea4e5d8 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Messages.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Messages.java
@@ -16,16 +16,49 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.views.modelexplorer.messages"; //$NON-NLS-1$
+	/**
+	 * @since 3.0
+	 */
 	public static String ExpandPreferencesGroup_ExpandGroupLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String ExpandPreferencesGroup_ExpandGroupTooltip;
+	/**
+	 * @since 3.0
+	 */
 	public static String ExpandPreferencesGroup_MaxLevelLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String FilterFieldPreferencesGroup_groupTitle;
+	/**
+	 * @since 3.0
+	 */
 	public static String FilterFieldPreferencesGroup_replaceDelimiterLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String FilterFieldPreferencesGroup_UseValidationPreferenceLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String FilterFieldPreferencesGroup_ValidationDelayPreferenceLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String ModelExplorerView_CaseSensitiveCheckBoxLabel;
+	/**
+	 * @since 3.0
+	 */
 	public static String ModelExplorerView_CaseSensitiveCheckBoxTooltip;
+	/**
+	 * @since 3.0
+	 */
 	public static String ModelExplorerView_SearchTextFieldTooltip;
+	/**
+	 * @since 3.0
+	 */
 	public static String MoDiscoLabelProvider_ProxyLabel;
 	static {
 		// initialize resource bundle
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/commands/RenameElementCommand.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/commands/RenameElementCommand.java
index 64bcf11f63a..f27e893c720 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/commands/RenameElementCommand.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/commands/RenameElementCommand.java
@@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Display;
 
 /**
  * Command to rename an element.
+ * @since 3.0
  */
 public class RenameElementCommand extends InteractiveCommandWrapper {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CollapseAllHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CollapseAllHandler.java
index 6905ee1c2cf..f2d8da80086 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CollapseAllHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/CollapseAllHandler.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.navigator.CommonViewer;
 
 /**
  * Handler to collapse all children at selected element.
+ * @since 3.0
  */
 public class CollapseAllHandler extends AbstractHandler {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/ExpandAllHandler.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/ExpandAllHandler.java
index 85f1e9b8750..6aa7e95b882 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/ExpandAllHandler.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/ExpandAllHandler.java
@@ -27,6 +27,7 @@ import org.eclipse.ui.navigator.CommonViewer;
 
 /**
  * Handler to expand all children at selected element.
+ * @since 3.0
  */
 public class ExpandAllHandler extends AbstractHandler {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ExpandPreferenceInitializer.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ExpandPreferenceInitializer.java
index 3f29c3223e4..240b2e578bb 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ExpandPreferenceInitializer.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ExpandPreferenceInitializer.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.views.modelexplorer.Activator;
 
 /**
  * This preference initializer for expand preferences.
+ * @since 3.0
  */
 public class ExpandPreferenceInitializer extends AbstractPreferenceInitializer {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/FilterPreferenceInitializer.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/FilterPreferenceInitializer.java
index decc20fc413..7d5b2906cfb 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/FilterPreferenceInitializer.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/FilterPreferenceInitializer.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.views.modelexplorer.Activator;
 
 /**
  * This preference initializer for filter preferences.
+ * @since 3.0
  */
 public class FilterPreferenceInitializer extends AbstractPreferenceInitializer {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IExpandPreferenceConstants.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IExpandPreferenceConstants.java
index 02e02f06e4c..ba45e87e4e7 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IExpandPreferenceConstants.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IExpandPreferenceConstants.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.views.modelexplorer.preferences;
 
 /**
  * Interface to define preference constants for the expand Action.
+ * @since 3.0
  */
 public interface IExpandPreferenceConstants {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IFilterPreferenceConstants.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IFilterPreferenceConstants.java
index f04172b6b03..47795da5e51 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IFilterPreferenceConstants.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/IFilterPreferenceConstants.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.views.modelexplorer.preferences;
 
 /**
  * Interface to define preference constants for the filter field.
+ * @since 3.0
  */
 public interface IFilterPreferenceConstants {
 
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/INavigatorPreferenceConstants.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/INavigatorPreferenceConstants.java
index 08b437a85da..fd38a7cd638 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/INavigatorPreferenceConstants.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/INavigatorPreferenceConstants.java
@@ -28,6 +28,7 @@ public interface INavigatorPreferenceConstants {
 	
 	/**
 	 * If this preferences is set to true. Then the model explorer will expand node on double click.
+	 * @since 3.0
 	 */
 	public static final String PREF_EXPAND_NODE_ON_DOUBLE_CLICK = "org.eclipse.papyrus.modelexplorer.ModelExplorerView.expandOnDoubleClick"; //$NON-NLS-1$
 }
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ModelExplorerPreferencePage.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ModelExplorerPreferencePage.java
index bc52974d5f3..4664c3c3ba7 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ModelExplorerPreferencePage.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/ModelExplorerPreferencePage.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 
 /**
  * Preference page for model explorer.
+ * @since 3.0
  */
 public class ModelExplorerPreferencePage extends AbstractPapyrusPreferencePage {
author	Florian Noyrit	2017-05-05 10:07:33 +0000
committer	Florian Noyrit	2017-05-09 08:14:26 +0000
commit	e547eb80614ac6baba8c4ba5b839bed631d39aac (patch)
tree	621514227b75f6efdb43f1c0026ade4f4a3484c7 /plugins
parent	85dd25671b246b9ee2db9eb87b76e5f754128041 (diff)
download	org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.tar.gz org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.tar.xz org.eclipse.papyrus-e547eb80614ac6baba8c4ba5b839bed631d39aac.zip