[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

58 files changed, 628 insertions, 564 deletions

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() {