539 files changed, 49362 insertions, 33637 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
index 589e2af08d0..6a2e59aed74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
@@ -91,14 +91,19 @@ public class AbstractionCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Abstraction_4007(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
index 6cff4f3873d..99b647ff319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
@@ -78,10 +78,12 @@ public class AbstractionReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class AbstractionReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class AbstractionReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class AbstractionReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
index 42d180aab70..7acdcaa1b0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class ActivityCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ActivityCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Activity newElement = UMLFactory.eINSTANCE.createActivity();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ActivityCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Activity_2060(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
index 8d0ac316937..38d2f2978b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ActivityCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ActivityCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Activity newElement = UMLFactory.eINSTANCE.createActivity();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ActivityCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Activity_3072(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
index e8077ff98ca..fa759fb9fb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
@@ -68,9 +68,12 @@ public class ActorCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ActorCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Actor newElement = UMLFactory.eINSTANCE.createActor();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ActorCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Actor_2077(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
index 7b64ad9f5aa..45cc0b38e79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ActorCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ActorCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Actor newElement = UMLFactory.eINSTANCE.createActor();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ActorCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Actor_3091(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
index 2c9c51b63db..744f0df133d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
@@ -68,9 +68,12 @@ public class AnyReceiveEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getAnyReceiveEvent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class AnyReceiveEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		AnyReceiveEvent newElement = UMLFactory.eINSTANCE.createAnyReceiveEvent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class AnyReceiveEventCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_AnyReceiveEvent_2085(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
index b0cfd64dd10..eab8c17ca12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
@@ -68,9 +68,12 @@ public class ArtifactCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ArtifactCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ArtifactCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Artifact_2079(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
index 5dad2ca8292..f0e6aef09c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ArtifactCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ArtifactCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ArtifactCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Artifact_3093(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
index ef780d995fe..89ffdf5327a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
@@ -68,9 +68,12 @@ public class CallEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCallEvent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CallEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		CallEvent newElement = UMLFactory.eINSTANCE.createCallEvent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CallEventCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_CallEvent_2084(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
index c21b88410db..dc6aa627b43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
@@ -68,9 +68,12 @@ public class ChangeEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getChangeEvent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ChangeEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		ChangeEvent newElement = UMLFactory.eINSTANCE.createChangeEvent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ChangeEventCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_ChangeEvent_2088(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
index 2a1192f22f4..12515f98ed9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class ClassCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ClassCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Class newElement = UMLFactory.eINSTANCE.createClass();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ClassCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Class_2073(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
index fa4d6a32190..f4a5d611029 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
@@ -67,9 +67,12 @@ public class ClassCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -77,7 +80,9 @@ public class ClassCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Class newElement = UMLFactory.eINSTANCE.createClass();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -86,14 +91,21 @@ public class ClassCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Class_3085(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
index 4a2b8321e92..2fbf21854a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class CollaborationCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CollaborationCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CollaborationCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Collaboration_2075(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
index b09fe91d262..fc26763c477 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class CollaborationCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CollaborationCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CollaborationCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Collaboration_3086(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
index 656d0085d2f..558672375e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
@@ -65,9 +65,12 @@ public class CollaborationRoleCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConnectableElement());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -75,6 +78,7 @@ public class CollaborationRoleCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
index b602db12577..98b8e511f26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
@@ -68,9 +68,12 @@ public class CollaborationUseCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaborationUse());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CollaborationUseCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		CollaborationUse newElement = UMLFactory.eINSTANCE.createCollaborationUse();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CollaborationUseCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Classifier qualifiedTarget = (Classifier) target;

-				qualifiedTarget.getCollaborationUses().add(newElement);

+				qualifiedTarget.getCollaborationUses()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_CollaborationUse_3071(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
index 85f98612ecd..ebd0745e2e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -75,10 +75,13 @@ public class CommentAnnotatedElementCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		if (getSource() != null && getTarget() != null) {

-			getSource().getAnnotatedElements().add(getTarget());

+			getSource().getAnnotatedElements()

+					.add(getTarget());

 		}

 		return CommandResult.newOKCommandResult();

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
index bdc08ce8c08..8536d42b66e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -117,8 +117,10 @@ public class CommentAnnotatedElementReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getAnnotatedElements().remove(getOldTarget());

-		getNewSource().getAnnotatedElements().add(getOldTarget());

+		getOldSource().getAnnotatedElements()

+				.remove(getOldTarget());

+		getNewSource().getAnnotatedElements()

+				.add(getOldTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

@@ -126,8 +128,10 @@ public class CommentAnnotatedElementReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getAnnotatedElements().remove(getOldTarget());

-		getOldSource().getAnnotatedElements().add(getNewTarget());

+		getOldSource().getAnnotatedElements()

+				.remove(getOldTarget());

+		getOldSource().getAnnotatedElements()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
index 0bafff94a2c..066e2ff7af1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
@@ -68,9 +68,12 @@ public class CommentCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CommentCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Comment newElement = UMLFactory.eINSTANCE.createComment();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CommentCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments().add(newElement);

+				qualifiedTarget.getOwnedComments()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Comment_2109(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
index 058cb7e0ffc..4b92696a8ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
@@ -68,9 +68,12 @@ public class CommentCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class CommentCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Comment newElement = UMLFactory.eINSTANCE.createComment();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class CommentCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Element qualifiedTarget = (Element) target;

-				qualifiedTarget.getOwnedComments().add(newElement);

+				qualifiedTarget.getOwnedComments()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Comment_3097(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
index ae631dddbbe..0e0fb5cfe55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class ComponentCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ComponentCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Component newElement = UMLFactory.eINSTANCE.createComponent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ComponentCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Component_2069(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
index 32a96dbbad5..a4f390fe7d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ComponentCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ComponentCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Component newElement = UMLFactory.eINSTANCE.createComponent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ComponentCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Component_3081(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
index 9512e1508b3..fcdd6f82dc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
@@ -91,14 +91,19 @@ public class ComponentRealizationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_ComponentRealization_4004(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
index 7707a597af0..cd3d91572b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
@@ -78,10 +78,12 @@ public class ComponentRealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class ComponentRealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class ComponentRealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class ComponentRealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
index ce5bd761b26..ed920fd120f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
@@ -91,14 +91,19 @@ public class ConnectorCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Connector newElement = UMLFactory.eINSTANCE.createConnector();

-		getContainer().getOwnedConnectors().add(newElement);

-		newElement.getEnds().add(getSource());

-		newElement.getEnds().add(getTarget());

+		getContainer().getOwnedConnectors()

+				.add(newElement);

+		newElement.getEnds()

+				.add(getSource());

+		newElement.getEnds()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Connector_4013(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
index 2450c6fa25b..f5497572f48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
@@ -78,10 +78,12 @@ public class ConnectorReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

 			return false;

 		}

-		if (getLink().getEnds().size() != 1) {

+		if (getLink().getEnds()

+				.size() != 1) {

 			return false;

 		}

-		ConnectorEnd target = getLink().getEnds().get(0);

+		ConnectorEnd target = getLink().getEnds()

+				.get(0);

 		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class ConnectorReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

 			return false;

 		}

-		if (getLink().getEnds().size() != 1) {

+		if (getLink().getEnds()

+				.size() != 1) {

 			return false;

 		}

-		ConnectorEnd source = getLink().getEnds().get(0);

+		ConnectorEnd source = getLink().getEnds()

+				.get(0);

 		if (!(getLink().eContainer() instanceof StructuredClassifier)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class ConnectorReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getEnds().remove(getOldSource());

-		getLink().getEnds().add(getNewSource());

+		getLink().getEnds()

+				.remove(getOldSource());

+		getLink().getEnds()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class ConnectorReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getEnds().remove(getOldTarget());

-		getLink().getEnds().add(getNewTarget());

+		getLink().getEnds()

+				.remove(getOldTarget());

+		getLink().getEnds()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
index a4e3af2430d..a391f9cf5ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -75,10 +75,13 @@ public class ConstraintConstrainedElementCreateCommand extends EditElementComman
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		if (getSource() != null && getTarget() != null) {

-			getSource().getConstrainedElements().add(getTarget());

+			getSource().getConstrainedElements()

+					.add(getTarget());

 		}

 		return CommandResult.newOKCommandResult();

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 3f3b02a08c3..8f64ecdfdab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -117,8 +117,10 @@ public class ConstraintConstrainedElementReorientCommand extends EditElementComm
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getConstrainedElements().remove(getOldTarget());

-		getNewSource().getConstrainedElements().add(getOldTarget());

+		getOldSource().getConstrainedElements()

+				.remove(getOldTarget());

+		getNewSource().getConstrainedElements()

+				.add(getOldTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

@@ -126,8 +128,10 @@ public class ConstraintConstrainedElementReorientCommand extends EditElementComm
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getConstrainedElements().remove(getOldTarget());

-		getOldSource().getConstrainedElements().add(getNewTarget());

+		getOldSource().getConstrainedElements()

+				.remove(getOldTarget());

+		getOldSource().getConstrainedElements()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
index 9afe43c1361..7fd1b8e43b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
@@ -68,9 +68,12 @@ public class ConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ConstraintCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Constraint_2114(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
index 0d20b652826..e383b0f8e5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ConstraintCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Constraint_3120(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
index cace4d25c95..87d453990af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
@@ -68,9 +68,12 @@ public class DataTypeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DataTypeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DataType newElement = UMLFactory.eINSTANCE.createDataType();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DataTypeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DataType_2068(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
index 53922906f3a..6f21fee4684 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class DataTypeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DataTypeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DataType newElement = UMLFactory.eINSTANCE.createDataType();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DataTypeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DataType_3080(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
index a8212261f24..12b31d4965f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
@@ -91,14 +91,19 @@ public class DependencyCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Dependency_4010(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
index ba89df91ad0..282c09d3662 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
@@ -78,10 +78,12 @@ public class DependencyReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class DependencyReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class DependencyReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class DependencyReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
index d37c22d1eb3..0a48fe3ab5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
@@ -91,14 +91,19 @@ public class DeploymentCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Deployment newElement = UMLFactory.eINSTANCE.createDeployment();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Deployment_4009(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
index 01954d0b15f..ba38f943933 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
@@ -78,10 +78,12 @@ public class DeploymentReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class DeploymentReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class DeploymentReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class DeploymentReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
index b6438fc9965..6e79dcfc56a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
@@ -68,9 +68,12 @@ public class DeploymentSpecificationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DeploymentSpecificationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DeploymentSpecificationCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DeploymentSpecification_2078(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
index 4d345c0be8c..8a0295c4f3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
@@ -68,9 +68,12 @@ public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DeploymentSpecification_3092(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
index 65e7cfb9c2d..40d61ad5677 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class DeviceCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DeviceCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Device newElement = UMLFactory.eINSTANCE.createDevice();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DeviceCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Device_2070(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
index 37dfc400ec3..83b1bbc22e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class DeviceCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DeviceCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Device newElement = UMLFactory.eINSTANCE.createDevice();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DeviceCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Device_3082(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
index bb2bf410c36..a1a169168f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
@@ -68,9 +68,12 @@ public class DurationConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DurationConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DurationConstraintCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DurationConstraint_2110(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
index 293cbe66cea..f2a7d6bdcf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
@@ -68,9 +68,12 @@ public class DurationConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DurationConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DurationConstraintCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DurationConstraint_3116(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
index 2cc044c9c82..3bb0f8740f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
@@ -68,9 +68,12 @@ public class DurationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDuration());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DurationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Duration newElement = UMLFactory.eINSTANCE.createDuration();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DurationCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Duration_2104(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
index d71413c5ea7..115201adef6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
@@ -68,9 +68,12 @@ public class DurationIntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationInterval());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DurationIntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DurationInterval newElement = UMLFactory.eINSTANCE.createDurationInterval();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DurationIntervalCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DurationInterval_2106(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
index 94f0cc69d4f..fb223bfe34c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
@@ -68,9 +68,12 @@ public class DurationObservationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class DurationObservationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class DurationObservationCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_DurationObservation_2093(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
index bae22677a7a..947170acb69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
@@ -75,10 +75,13 @@ public class DurationObservationEventCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		if (getSource() != null && getTarget() != null) {

-			getSource().getEvents().add(getTarget());

+			getSource().getEvents()

+					.add(getTarget());

 		}

 		return CommandResult.newOKCommandResult();

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
index 93e506c1877..55f88c9f503 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
@@ -117,8 +117,10 @@ public class DurationObservationEventReorientCommand extends EditElementCommand
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getEvents().remove(getOldTarget());

-		getNewSource().getEvents().add(getOldTarget());

+		getOldSource().getEvents()

+				.remove(getOldTarget());

+		getNewSource().getEvents()

+				.add(getOldTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

@@ -126,8 +128,10 @@ public class DurationObservationEventReorientCommand extends EditElementCommand
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getEvents().remove(getOldTarget());

-		getOldSource().getEvents().add(getNewTarget());

+		getOldSource().getEvents()

+				.remove(getOldTarget());

+		getOldSource().getEvents()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
index 6a5dc4f6ab9..456d271a7e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
@@ -68,9 +68,12 @@ public class EnumerationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class EnumerationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class EnumerationCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Enumeration_2067(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
index 1a3bd3f95a2..709315b1f60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
@@ -68,9 +68,12 @@ public class EnumerationCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class EnumerationCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class EnumerationCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Enumeration_3079(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
index b1dd93e796b..e70a0ca036b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
@@ -68,9 +68,12 @@ public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumerationLiteral());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		EnumerationLiteral newElement = UMLFactory.eINSTANCE.createEnumerationLiteral();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Enumeration qualifiedTarget = (Enumeration) target;

-				qualifiedTarget.getOwnedLiterals().add(newElement);

+				qualifiedTarget.getOwnedLiterals()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_EnumerationLiteral_3066(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
index daea48f955f..934c8511c1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class ExecutionEnvironmentCompositeCreateCommand extends EditElementComma
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ExecutionEnvironmentCompositeCreateCommand extends EditElementComma
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ExecutionEnvironmentCompositeCreateCommand extends EditElementComma
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_ExecutionEnvironment_2071(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
index 3ff37b91210..72509273344 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCom
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCom
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCom
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_ExecutionEnvironment_3083(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
index 4fc72c7fd79..d12098fcfab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
@@ -68,9 +68,12 @@ public class ExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExpression());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Expression newElement = UMLFactory.eINSTANCE.createExpression();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ExpressionCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Expression_2103(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
index f5718a7084b..199596d7dd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_FunctionBehavior_2064(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
index 5b12704053a..ef708e95865 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_FunctionBehavior_3076(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
index 0756be486c8..8bcc9233b21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
@@ -89,13 +89,20 @@ public class GeneralizationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();

-		getContainer().getGeneralizations().add(newElement);

-		newElement.setSpecific(getSource());

-		newElement.setGeneral(getTarget());

+		getContainer().getGeneralizations()

+				.add(newElement);

+		newElement.setSpecific(

+				getSource()

+				);

+		newElement.setGeneral(

+				getTarget()

+				);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
index e49e96e52c5..44007bb86ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
@@ -121,7 +121,9 @@ public class GeneralizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().setSpecific(getNewSource());

+		getLink().setSpecific(

+				getNewSource()

+				);

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -129,7 +131,9 @@ public class GeneralizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().setGeneral(getNewTarget());

+		getLink().setGeneral(

+				getNewTarget()

+				);

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
index 9d278c2756c..d240f2b22e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
@@ -91,14 +91,19 @@ public class InformationFlowCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		InformationFlow newElement = UMLFactory.eINSTANCE.createInformationFlow();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getInformationSources().add(getSource());

-		newElement.getInformationTargets().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getInformationSources()

+				.add(getSource());

+		newElement.getInformationTargets()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_InformationFlow_4021(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
index fd2908b8b18..51daa602f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
@@ -78,10 +78,12 @@ public class InformationFlowReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getInformationTargets().size() != 1) {

+		if (getLink().getInformationTargets()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getInformationTargets().get(0);

+		NamedElement target = getLink().getInformationTargets()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class InformationFlowReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getInformationSources().size() != 1) {

+		if (getLink().getInformationSources()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getInformationSources().get(0);

+		NamedElement source = getLink().getInformationSources()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class InformationFlowReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getInformationSources().remove(getOldSource());

-		getLink().getInformationSources().add(getNewSource());

+		getLink().getInformationSources()

+				.remove(getOldSource());

+		getLink().getInformationSources()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class InformationFlowReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getInformationTargets().remove(getOldTarget());

-		getLink().getInformationTargets().add(getNewTarget());

+		getLink().getInformationTargets()

+				.remove(getOldTarget());

+		getLink().getInformationTargets()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
index ed2c98d5402..05c80ab5420 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
@@ -68,9 +68,12 @@ public class InformationItemCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InformationItemCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InformationItemCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_InformationItem_2080(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
index 2bfa18b0105..8d304df6c33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
@@ -68,9 +68,12 @@ public class InformationItemCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InformationItemCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InformationItemCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_InformationItem_3094(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
index 75860862819..1b299639e92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
@@ -68,9 +68,12 @@ public class InstanceValueCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInstanceValue());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InstanceValueCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		InstanceValue newElement = UMLFactory.eINSTANCE.createInstanceValue();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InstanceValueCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_InstanceValue_2108(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
index eb6e88fa2f6..7dc89ba9adf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class InteractionCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InteractionCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InteractionCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Interaction_2061(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
index 12d1d0a8beb..f78e10a932a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class InteractionCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InteractionCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InteractionCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Interaction_3073(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
index 6ce06e8ea9b..d2055558e88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
@@ -68,9 +68,12 @@ public class InteractionConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InteractionConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InteractionConstraintCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_InteractionConstraint_2113(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
index ca3d02bf086..331473fee5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
@@ -68,9 +68,12 @@ public class InteractionConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InteractionConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InteractionConstraintCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_InteractionConstraint_3119(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
index 948627ab278..8c6e483e5c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
@@ -68,9 +68,12 @@ public class InterfaceCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InterfaceCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Interface newElement = UMLFactory.eINSTANCE.createInterface();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InterfaceCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Interface_2076(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
index 6d1b49f1132..cfba0a72601 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
@@ -68,9 +68,12 @@ public class InterfaceCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class InterfaceCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Interface newElement = UMLFactory.eINSTANCE.createInterface();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class InterfaceCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Interface_3087(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
index 7e780d87606..1af9688ffde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
@@ -91,14 +91,19 @@ public class InterfaceRealizationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		InterfaceRealization newElement = UMLFactory.eINSTANCE.createInterfaceRealization();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_InterfaceRealization_4005(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
index cde56c74776..852fc87de2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
@@ -78,10 +78,12 @@ public class InterfaceRealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class InterfaceRealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class InterfaceRealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class InterfaceRealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
index 9a43e014443..0a96e29024c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
@@ -68,9 +68,12 @@ public class IntervalConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class IntervalConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class IntervalConstraintCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_IntervalConstraint_2112(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
index 91cdc0372df..3a4397ff2ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
@@ -68,9 +68,12 @@ public class IntervalConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class IntervalConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class IntervalConstraintCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_IntervalConstraint_3118(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
index 16e64c3eb7a..f884b2e087b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
@@ -68,9 +68,12 @@ public class IntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterval());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class IntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Interval newElement = UMLFactory.eINSTANCE.createInterval();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class IntervalCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Interval_2107(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
index 7adfe5c0d81..946acc207de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
@@ -68,9 +68,12 @@ public class LiteralBooleanCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralBoolean());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class LiteralBooleanCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		LiteralBoolean newElement = UMLFactory.eINSTANCE.createLiteralBoolean();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class LiteralBooleanCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_LiteralBoolean_2095(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
index c449286f1bf..cc7643119d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
@@ -68,9 +68,12 @@ public class LiteralIntegerCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralInteger());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class LiteralIntegerCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		LiteralInteger newElement = UMLFactory.eINSTANCE.createLiteralInteger();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class LiteralIntegerCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_LiteralInteger_2096(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
index fa7e0f15189..a66350229c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
@@ -68,9 +68,12 @@ public class LiteralNullCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralNull());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class LiteralNullCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		LiteralNull newElement = UMLFactory.eINSTANCE.createLiteralNull();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class LiteralNullCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_LiteralNull_2097(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
index c0403a4651d..21aa00c12bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
@@ -68,9 +68,12 @@ public class LiteralStringCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralString());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class LiteralStringCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		LiteralString newElement = UMLFactory.eINSTANCE.createLiteralString();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class LiteralStringCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_LiteralString_2098(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
index b9adbc5644e..d0ad24c4a58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
@@ -68,9 +68,12 @@ public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		LiteralUnlimitedNatural newElement = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_LiteralUnlimitedNatural_2099(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
index de752c7e1f1..98e8b232ee0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
@@ -91,14 +91,19 @@ public class ManifestationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Manifestation_4012(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
index ac159d87188..29fb1d7f210 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
@@ -78,10 +78,12 @@ public class ManifestationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class ManifestationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class ManifestationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class ManifestationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
index 095eba6b2f3..f2e43b0beab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class NodeCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class NodeCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Node newElement = UMLFactory.eINSTANCE.createNode();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class NodeCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Node_2072(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
index 22729d034bd..ef976cf2997 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class NodeCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class NodeCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Node newElement = UMLFactory.eINSTANCE.createNode();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class NodeCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Node_3084(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
index 694cdf2bd89..54c71ba5575 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_OpaqueBehavior_2065(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
index a59be0718e4..b5d9afbcba5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_OpaqueBehavior_3077(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
index 7f77e266f0b..3e110d866a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
@@ -68,9 +68,12 @@ public class OpaqueExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueExpression());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class OpaqueExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		OpaqueExpression newElement = UMLFactory.eINSTANCE.createOpaqueExpression();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class OpaqueExpressionCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_OpaqueExpression_2101(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
index 0a9270d64bf..77db9b80e22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
@@ -68,9 +68,12 @@ public class OperationCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOperation());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class OperationCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Operation newElement = UMLFactory.eINSTANCE.createOperation();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class OperationCreateCommandCLN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getOwnedOperations().add(newElement);

+				qualifiedTarget.getOwnedOperations()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Operation_3102(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
index 766fa25b65f..4537d7e4dfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
@@ -68,9 +68,12 @@ public class ParameterCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getParameter());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ParameterCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Parameter newElement = UMLFactory.eINSTANCE.createParameter();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ParameterCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Behavior qualifiedTarget = (Behavior) target;

-				qualifiedTarget.getOwnedParameters().add(newElement);

+				qualifiedTarget.getOwnedParameters()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Parameter_3088(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
index 5bfb339b200..02c4585de94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
@@ -68,9 +68,12 @@ public class PortCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class PortCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Port newElement = UMLFactory.eINSTANCE.createPort();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class PortCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes().add(newElement);

+				qualifiedTarget.getOwnedAttributes()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Port_3069(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
index 6e5bf217549..72ee3289231 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
@@ -68,9 +68,12 @@ public class PrimitiveTypeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class PrimitiveTypeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class PrimitiveTypeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_PrimitiveType_2066(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
index 4c6bc3936ed..a3ae7900d4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class PrimitiveTypeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class PrimitiveTypeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class PrimitiveTypeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_PrimitiveType_3078(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
index 3bee656816a..e3838a8e81f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
@@ -68,9 +68,12 @@ public class PropertyCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class PropertyCreateCommandCLN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Property newElement = UMLFactory.eINSTANCE.createProperty();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class PropertyCreateCommandCLN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes().add(newElement);

+				qualifiedTarget.getOwnedAttributes()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Property_3101(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
index 68587d7a4d0..6e46c365cd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
@@ -68,9 +68,12 @@ public class PropertyPartCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class PropertyPartCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Property newElement = UMLFactory.eINSTANCE.createProperty();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class PropertyPartCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;

-				qualifiedTarget.getOwnedAttributes().add(newElement);

+				qualifiedTarget.getOwnedAttributes()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Property_3070(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
index 64a0ae51b20..76ff439b104 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class ProtocolStateMachineCompositeCreateCommand extends EditElementComma
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ProtocolStateMachineCompositeCreateCommand extends EditElementComma
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ProtocolStateMachineCompositeCreateCommand extends EditElementComma
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_ProtocolStateMachine_2062(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
index 0683febebf3..d25cb7d359b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCom
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCom
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCom
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_ProtocolStateMachine_3074(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
index d6250b5c1c9..1cb52273fae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
@@ -91,14 +91,19 @@ public class RealizationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Realization newElement = UMLFactory.eINSTANCE.createRealization();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Realization_4006(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
index 1cd343891d1..d5d442ff3ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
@@ -78,10 +78,12 @@ public class RealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class RealizationReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class RealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class RealizationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
index 033c155d716..936ca225258 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
@@ -75,10 +75,13 @@ public class RepresentationCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		if (getSource() != null && getTarget() != null) {

-			getSource().getRepresenteds().add(getTarget());

+			getSource().getRepresenteds()

+					.add(getTarget());

 		}

 		return CommandResult.newOKCommandResult();

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
index 2f19fe758c7..472cb220d9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
@@ -117,8 +117,10 @@ public class RepresentationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().getRepresenteds().remove(getOldTarget());

-		getNewSource().getRepresenteds().add(getOldTarget());

+		getOldSource().getRepresenteds()

+				.remove(getOldTarget());

+		getNewSource().getRepresenteds()

+				.add(getOldTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

@@ -126,8 +128,10 @@ public class RepresentationReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().getRepresenteds().remove(getOldTarget());

-		getOldSource().getRepresenteds().add(getNewTarget());

+		getOldSource().getRepresenteds()

+				.remove(getOldTarget());

+		getOldSource().getRepresenteds()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
index 27529d35649..c5b2dae8681 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
@@ -90,13 +90,18 @@ public class RoleBindingCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
index 5a668a26176..87712830b9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
@@ -78,10 +78,12 @@ public class RoleBindingReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class RoleBindingReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class RoleBindingReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class RoleBindingReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
index fb83fd85ec1..ee7c76ed3ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
@@ -68,9 +68,12 @@ public class SignalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class SignalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Signal newElement = UMLFactory.eINSTANCE.createSignal();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class SignalCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Signal_2081(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
index 1d875d7fa1b..a0e302f68ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
@@ -68,9 +68,12 @@ public class SignalCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class SignalCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		Signal newElement = UMLFactory.eINSTANCE.createSignal();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class SignalCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_Signal_3095(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
index 94b5e4dfbcd..571edaffbc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
@@ -68,9 +68,12 @@ public class SignalEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignalEvent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class SignalEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		SignalEvent newElement = UMLFactory.eINSTANCE.createSignalEvent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class SignalEventCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_SignalEvent_2083(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
index eea44c16b35..cced801abc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
@@ -68,9 +68,12 @@ public class StateMachineCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class StateMachineCompositeCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class StateMachineCompositeCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_StateMachine_2063(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
index 005d7ff89d7..dc54122595c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
@@ -68,9 +68,12 @@ public class StateMachineCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class StateMachineCompositeCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class StateMachineCompositeCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_StateMachine_3075(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
index e1781820bb9..f4a022d5331 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
@@ -68,9 +68,12 @@ public class StringExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStringExpression());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class StringExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		StringExpression newElement = UMLFactory.eINSTANCE.createStringExpression();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class StringExpressionCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_StringExpression_2100(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
index 1418958bc9a..be362d2c41a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
@@ -91,14 +91,19 @@ public class SubstitutionCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Substitution_4011(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
index c527987aeca..b4e349534b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
@@ -78,10 +78,12 @@ public class SubstitutionReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class SubstitutionReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class SubstitutionReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class SubstitutionReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
index b2ce940f60a..b5fe60584a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
@@ -68,9 +68,12 @@ public class TimeConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeConstraintCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeConstraintCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeConstraint_2111(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
index c1e7f8f36c3..12042a8b2f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
@@ -68,9 +68,12 @@ public class TimeConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeConstraintCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeConstraintCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Namespace qualifiedTarget = (Namespace) target;

-				qualifiedTarget.getOwnedRules().add(newElement);

+				qualifiedTarget.getOwnedRules()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeConstraint_3117(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
index 4173c799439..9e92b0d7f9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
@@ -68,9 +68,12 @@ public class TimeEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeEvent());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeEventCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeEvent newElement = UMLFactory.eINSTANCE.createTimeEvent();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeEventCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeEvent_2089(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
index ff30387bc16..fcec1bb3586 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
@@ -68,9 +68,12 @@ public class TimeExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeExpression());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeExpressionCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeExpression newElement = UMLFactory.eINSTANCE.createTimeExpression();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeExpressionCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeExpression_2102(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
index ed6f1f73f85..93c8a48f4b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
@@ -68,9 +68,12 @@ public class TimeIntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeInterval());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeIntervalCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeInterval newElement = UMLFactory.eINSTANCE.createTimeInterval();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeIntervalCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeInterval_2105(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
index fa88d4865e7..e62dce4fdb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
@@ -68,9 +68,12 @@ public class TimeObservationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class TimeObservationCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class TimeObservationCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_TimeObservation_2094(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
index 6e6fcc88ced..682d3a59270 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
@@ -75,10 +75,14 @@ public class TimeObservationEventCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		if (getSource() != null && getTarget() != null) {

-			getSource().setEvent(getTarget());

+			getSource().setEvent(

+					getTarget()

+					);

 		}

 		return CommandResult.newOKCommandResult();

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
index b0d33db8ee4..c480680ed97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
@@ -117,8 +117,12 @@ public class TimeObservationEventReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getOldSource().setEvent(null);

-		getNewSource().setEvent(getOldTarget());

+		getOldSource().setEvent(

+				null

+				);

+		getNewSource().setEvent(

+				getOldTarget()

+				);

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

@@ -126,7 +130,9 @@ public class TimeObservationEventReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getOldSource().setEvent(getNewTarget());

+		getOldSource().setEvent(

+				getNewTarget()

+				);

 		return CommandResult.newOKCommandResult(referenceOwner);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
index 4943aae7a85..7e56f7a594b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
@@ -91,14 +91,19 @@ public class UsageCreateCommand extends EditElementCommand {
 		if (!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

+

 		Usage newElement = UMLFactory.eINSTANCE.createUsage();

-		getContainer().getPackagedElements().add(newElement);

-		newElement.getClients().add(getSource());

-		newElement.getSuppliers().add(getTarget());

+		getContainer().getPackagedElements()

+				.add(newElement);

+		newElement.getClients()

+				.add(getSource());

+		newElement.getSuppliers()

+				.add(getTarget());

 		ElementInitializers.getInstance().init_Usage_4008(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
index 963aa4c2542..74cfc0b67d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
@@ -78,10 +78,12 @@ public class UsageReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getSuppliers().size() != 1) {

+		if (getLink().getSuppliers()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement target = getLink().getSuppliers().get(0);

+		NamedElement target = getLink().getSuppliers()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -96,10 +98,12 @@ public class UsageReorientCommand extends EditElementCommand {
 		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

 			return false;

 		}

-		if (getLink().getClients().size() != 1) {

+		if (getLink().getClients()

+				.size() != 1) {

 			return false;

 		}

-		NamedElement source = getLink().getClients().get(0);

+		NamedElement source = getLink().getClients()

+				.get(0);

 		if (!(getLink().eContainer() instanceof Package)) {

 			return false;

 		}

@@ -128,8 +132,10 @@ public class UsageReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientSource() throws ExecutionException {

-		getLink().getClients().remove(getOldSource());

-		getLink().getClients().add(getNewSource());

+		getLink().getClients()

+				.remove(getOldSource());

+		getLink().getClients()

+				.add(getNewSource());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

@@ -137,8 +143,10 @@ public class UsageReorientCommand extends EditElementCommand {
 	 * @generated

 	 */

 	protected CommandResult reorientTarget() throws ExecutionException {

-		getLink().getSuppliers().remove(getOldTarget());

-		getLink().getSuppliers().add(getNewTarget());

+		getLink().getSuppliers()

+				.remove(getOldTarget());

+		getLink().getSuppliers()

+				.add(getNewTarget());

 		return CommandResult.newOKCommandResult(getLink());

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
index 957f250a6e2..d700030932c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
@@ -68,9 +68,12 @@ public class UseCaseCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class UseCaseCreateCommand extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class UseCaseCreateCommand extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Package qualifiedTarget = (Package) target;

-				qualifiedTarget.getPackagedElements().add(newElement);

+				qualifiedTarget.getPackagedElements()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_UseCase_2082(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
index 472346e8ade..265c7762378 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
@@ -68,9 +68,12 @@ public class UseCaseCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	public boolean canExecute() {

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

 		return data.isPermitted();

+

+

 	}

 

 	/**

@@ -78,7 +81,9 @@ public class UseCaseCreateCommandCN extends EditElementCommand {
 	 */

 	@Override

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+

 		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

+

 		EObject target = getElementToEdit();

 		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

 		if (data.isPermitted()) {

@@ -87,14 +92,21 @@ public class UseCaseCreateCommandCN extends EditElementCommand {
 					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

 				}

 			} else {

+

 				Class qualifiedTarget = (Class) target;

-				qualifiedTarget.getNestedClassifiers().add(newElement);

+				qualifiedTarget.getNestedClassifiers()

+						.add(newElement);

+

 			}

 		} else {

 			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

 		}

+

+

 		ElementInitializers.getInstance().init_UseCase_3096(newElement);

+

 		doConfigure(newElement, monitor, info);

+

 		((CreateElementRequest) getRequest()).setNewElement(newElement);

 		return CommandResult.newOKCommandResult(newElement);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
index 30ddf532741..fa4a0a20bce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6020;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AbstractionAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6020;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public AbstractionAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
index dd2227b9e82..20d891e96ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
@@ -54,10 +54,12 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof AbstractionNameEditPart) {

-			((AbstractionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((AbstractionNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

-			((AbstractionAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((AbstractionAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
index e44e145a741..60669d536e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6006;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public AbstractionNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6006;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public AbstractionNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
index f599daccf3a..46b5c4b6638 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPa
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPa
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPa
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
index 627296e2c8e..1b399c6f938 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEdit
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEdit
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEdit
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index c8eee94d9ad..c43819f8769 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -141,6 +141,7 @@ public class ActivityCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class ActivityCompositeEditPart extends NamedElementEditPart {
 			((ActivityCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class ActivityCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index dab26c0fb6a..b06c0a325ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class ActivityCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class ActivityCompositeEditPartCN extends NamedElementEditPart {
 			((ActivityCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class ActivityCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
index 604d4b39a05..70690b25716 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
index 592a122e08c..15430f4d634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
index af31d0e5780..8cebbfc4443 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
@@ -133,6 +133,8 @@ public class ActorEditPart extends NodeEditPart {
 			((ActorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class ActorEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
index 03c735fe705..00b8a66b849 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -133,6 +133,8 @@ public class ActorEditPartCN extends NodeEditPart {
 			((ActorNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class ActorEditPartCN extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
index 7167b965743..f9c4061bd48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
@@ -199,7 +199,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
index 615669f02fc..6f1e91adf7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index e822ca266a9..f5b6f7c8694 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -131,6 +131,8 @@ public class AnyReceiveEventEditPart extends NodeEditPart {
 			((AnyReceiveEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class AnyReceiveEventEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
index a950611a369..bacec8cea8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
@@ -199,7 +199,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
index 9c980d5a3df..31551aa9ec1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -133,6 +133,8 @@ public class ArtifactEditPart extends NodeEditPart {
 			((ArtifactNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class ArtifactEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
index cd55880d55f..de88ba3568b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -133,6 +133,8 @@ public class ArtifactEditPartCN extends NodeEditPart {
 			((ArtifactNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class ArtifactEditPartCN extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
index 1f4f70e6509..eb4df815562 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
@@ -199,7 +199,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
index 317fbba1aef..1c470573b59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
index 4d08b87a9ee..0b8d143d575 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
@@ -109,6 +109,7 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -149,6 +150,7 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
index 1d9a17a520a..b0d874dadf4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
@@ -131,6 +131,8 @@ public class CallEventEditPart extends NodeEditPart {
 			((CallEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class CallEventEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
index bcad0a7630d..e1cb5006fe1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
@@ -199,7 +199,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
index a97b6a0d2fc..aef7e3215d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -131,6 +131,8 @@ public class ChangeEventEditPart extends NodeEditPart {
 			((ChangeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class ChangeEventEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
index da2cee2dc05..4c0352e25df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
@@ -199,7 +199,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
index 6955d83ccbc..46bc3ebcf72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
index afb4c559724..fbf745619df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPar
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPar
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPar
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
index bf8e55ae412..0751540da3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -142,6 +142,7 @@ public class ClassCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class ClassCompositeEditPart extends NamedElementEditPart {
 			((ClassCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class ClassCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index f3b96f112ab..8af6f25bc39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -142,6 +142,7 @@ public class ClassCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class ClassCompositeEditPartCN extends NamedElementEditPart {
 			((ClassCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class ClassCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
index d7275a15296..0bc110eae62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
index da468671b4d..92d8064d3fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
index 3b9633f0648..9304a3277dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentE
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentE
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentE
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
index 7c9dd87099b..836c8b75b36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmen
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmen
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmen
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index d060edad7e0..8a1ab4dc2f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -120,6 +120,7 @@ public class CollaborationCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -148,12 +149,15 @@ public class CollaborationCompositeEditPart extends NamedElementEditPart {
 			((CollaborationCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -225,6 +229,7 @@ public class CollaborationCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index fb2f39fa5f9..eef3769adf5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -120,6 +120,7 @@ public class CollaborationCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -148,12 +149,15 @@ public class CollaborationCompositeEditPartCN extends NamedElementEditPart {
 			((CollaborationCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -225,6 +229,7 @@ public class CollaborationCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
index d9cab372ccd..46ae8bb5d8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPa
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
index 3933c6a4b49..bb1870ae291 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEdit
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index 06b8b767abb..5a0393f6705 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -118,6 +118,7 @@ public class CollaborationRoleEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class CollaborationRoleEditPartCN extends NamedElementEditPart {
 			((CollaborationRoleNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class CollaborationRoleEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
index ad9b9efe1c0..135418ab7f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
@@ -199,7 +199,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -697,9 +727,11 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -721,7 +753,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -769,15 +802,18 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -820,7 +856,8 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -830,6 +867,7 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -837,5 +875,6 @@ public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index aa24a8b56a4..9c3aa78b52f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -118,6 +118,7 @@ public class CollaborationUseEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class CollaborationUseEditPartCN extends NamedElementEditPart {
 			((CollaborationUseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class CollaborationUseEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
index db4c083a53e..599b940311d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
@@ -201,7 +201,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -264,7 +265,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -296,7 +299,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -319,18 +324,21 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -372,7 +380,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -422,7 +432,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -434,7 +446,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -447,14 +461,17 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -462,6 +479,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -483,14 +501,15 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -527,7 +546,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -546,14 +566,17 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -563,7 +586,9 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -574,9 +599,14 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -657,6 +687,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -706,9 +737,11 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -730,7 +763,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -778,15 +812,18 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -829,7 +866,8 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -839,6 +877,7 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -846,5 +885,6 @@ public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
index 3f4ffce23e3..5e55f05e3c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
@@ -195,7 +195,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
index 79dd2d2315e..783a4bb14fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
@@ -195,7 +195,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
index 019b600e684..9213eb50e4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
@@ -112,6 +112,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -140,6 +141,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -203,6 +206,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
index 7aecb6960d4..4b1f13c2f70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -112,6 +112,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -140,6 +141,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 			((CommentBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -203,6 +206,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
index 30690ac322e..95483a708d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditP
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditP
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditP
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index 73d0a4c96ce..c058d527e5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEdi
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEdi
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEdi
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index a3eb0883777..cb04e185434 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -142,6 +142,7 @@ public class ComponentCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class ComponentCompositeEditPart extends NamedElementEditPart {
 			((ComponentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class ComponentCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index 2105de1a3ee..563154d014c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -142,6 +142,7 @@ public class ComponentCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class ComponentCompositeEditPartCN extends NamedElementEditPart {
 			((ComponentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class ComponentCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
index c175336a3b4..aead6a85642 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
index 926d33b5947..971b9b4455d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index e5595791b7e..38e3c9da63a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6015;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6015;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ComponentRealizationAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
index 18d6277eedb..396e574cfc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
@@ -54,10 +54,12 @@ public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart impl
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ComponentRealizationNameEditPart) {

-			((ComponentRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((ComponentRealizationNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

-			((ComponentRealizationAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((ComponentRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
index cf2c9cb6f9d..0dba77605de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6001;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ComponentRealizationNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6001;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ComponentRealizationNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
index a0ae1923f62..90a671dad6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
@@ -48,8 +48,10 @@ public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart {
 	@Override

 	protected void createDefaultEditPolicies() {

 		super.createDefaultEditPolicies();

+

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+

 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());

 		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
index 1c460bbf676..28032908537 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6025;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConnectorAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6025;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConnectorAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
index b92b3953bae..e8061858d70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
@@ -54,16 +54,20 @@ public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITre
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

-			((ConnectorAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((ConnectorAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		if (childEditPart instanceof ConnectorNameEditPart) {

-			((ConnectorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((ConnectorNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

-			((ConnectorMultiplicitySourceEditPart) childEditPart).setLabel(getPrimaryShape().getMultiplicitySourceLabel());

+			((ConnectorMultiplicitySourceEditPart) childEditPart).setLabel(

+					getPrimaryShape().getMultiplicitySourceLabel());

 		}

 		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

-			((ConnectorMultiplicityTargetEditPart) childEditPart).setLabel(getPrimaryShape().getMultiplicityTargetLabel());

+			((ConnectorMultiplicityTargetEditPart) childEditPart).setLabel(

+					getPrimaryShape().getMultiplicityTargetLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
index 717cc7ee040..16bb472f205 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6051;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConnectorMultiplicitySourceEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.SOURCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6051;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConnectorMultiplicitySourceEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.SOURCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
index ef010cbee27..aca73e598bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6052;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConnectorMultiplicityTargetEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.TARGET;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6052;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID), new Point(0, 20));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConnectorMultiplicityTargetEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.TARGET;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
index 341bcd71865..e996bc594f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
@@ -1,806 +1,845 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6050;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ConnectorNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		EObject parserElement = getParserElement();

-		if (parserElement == null) {

-			return null;

-		}

-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

-		for (View view : views) {

-			if (AppearanceHelper.showElementIcon(view)) {

-				return UMLElementTypes.getImage(parserElement.eClass());

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {

-			refreshLabel();

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6050;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ConnectorNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		EObject parserElement = getParserElement();
+		if (parserElement == null) {
+			return null;
+		}
+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
+		for (View view : views) {
+			if (AppearanceHelper.showElementIcon(view)) {
+				return UMLElementTypes.getImage(parserElement.eClass());
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
+			refreshLabel();
+		}
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
index 6f6412a4a8b..886f5ff6273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -112,6 +112,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			((ConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
index e22f653b83d..298bc883bf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
@@ -112,6 +112,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 			((ConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
index e42b71f5b4c..4b7e4711ea6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
@@ -199,7 +199,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
index 2bb2fb85ede..77cd84fc4da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
index 48c84a23171..65b56f7e974 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
@@ -195,7 +195,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
index 63fd84ad760..e4a19b29154 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
@@ -195,7 +195,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
index 4ae1011d6ad..2ad196411cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -96,6 +96,7 @@ public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPar
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPar
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPar
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index 6230740e6a0..ff259f05eb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -96,6 +96,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditP
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditP
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditP
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
index a3a532f0060..df4a67c1180 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -124,6 +124,7 @@ public class DataTypeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -152,18 +153,22 @@ public class DataTypeEditPart extends NamedElementEditPart {
 			((DataTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

+

 		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -243,6 +248,7 @@ public class DataTypeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
index 9556eafebb7..dfbf761d4f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -124,6 +124,7 @@ public class DataTypeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -152,18 +153,22 @@ public class DataTypeEditPartCN extends NamedElementEditPart {
 			((DataTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

+

 		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -243,6 +248,7 @@ public class DataTypeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
index 7343f870b46..1a845f2f9c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
@@ -199,7 +199,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
index f4fac3b4cce..d6aba99051b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
index 1c06a2ee01e..bc4ea1307ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -96,6 +96,7 @@ public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPar
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPar
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPar
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 3962e27a89a..969183c270b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -96,6 +96,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditP
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditP
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditP
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
index 3bc3289281b..173e4795922 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6023;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public DependencyAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6023;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public DependencyAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
index a302098dd54..a20b3d3655e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
@@ -54,10 +54,12 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof DependencyNameEditPart) {

-			((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((DependencyNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {

-			((DependencyAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((DependencyAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
index 22d24f0b1a9..746472bf595 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6009;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public DependencyNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6009;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public DependencyNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index d25cf1eddf2..9915fd3f991 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6022;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public DeploymentAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6022;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public DeploymentAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
index ec5c45d2f46..157cbb1f240 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
@@ -54,10 +54,12 @@ public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITr
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof DeploymentNameEditPart) {

-			((DeploymentNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((DeploymentNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

-			((DeploymentAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((DeploymentAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
index 7a5e2037175..a2d8bf22d50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6008;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public DeploymentNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6008;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public DeploymentNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index c819184ee69..9c5896b27b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -131,6 +131,8 @@ public class DeploymentSpecificationEditPart extends NodeEditPart {
 			((DeploymentSpecificationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class DeploymentSpecificationEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 3471a02e96b..9604e3e5053 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -131,6 +131,8 @@ public class DeploymentSpecificationEditPartCN extends NodeEditPart {
 			((DeploymentSpecificationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class DeploymentSpecificationEditPartCN extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
index 6a4371953b2..c12208ece57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
@@ -199,7 +199,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
index 4e331a4fa90..abace2c77c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
@@ -199,7 +199,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
index 9670de2bb04..cc11d61169c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index da765c905a1..10e4db0bf97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPa
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPa
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPa
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index abaa791596e..3d8f61679fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -140,6 +140,7 @@ public class DeviceCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -168,18 +169,25 @@ public class DeviceCompositeEditPart extends NamedElementEditPart {
 			((DeviceCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -258,6 +266,7 @@ public class DeviceCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index e4532afb918..730ebefd883 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -140,6 +140,7 @@ public class DeviceCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -168,18 +169,25 @@ public class DeviceCompositeEditPartCN extends NamedElementEditPart {
 			((DeviceCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -258,6 +266,7 @@ public class DeviceCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
index 93cd6215ebd..51906b6b045 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
index e94370c9fff..1ba2c212207 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
index a325ea83e34..0e458ba62a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -112,6 +112,7 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 			((DurationConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
index 52036ae93c1..8cd28e93afc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
@@ -112,6 +112,7 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 			((DurationConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
index 8f47a1205ff..4a953fdb3da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
@@ -199,7 +199,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
index 45ea761025e..28836517fe3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
@@ -199,7 +199,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
index 00c88505f91..bdcd9383ed0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
@@ -195,7 +195,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
index 18ed15d723d..4b3ea48bb88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
@@ -195,7 +195,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
index e25776acb83..3ff43b8b7d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
@@ -131,6 +131,8 @@ public class DurationEditPart extends NodeEditPart {
 			((DurationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class DurationEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
index 38fd70794a2..2a26642b3c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -131,6 +131,8 @@ public class DurationIntervalEditPart extends NodeEditPart {
 			((DurationIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class DurationIntervalEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
index 9b960d58815..8800f289818 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
@@ -199,7 +199,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
index d1c2ad9afb7..11e30fd76f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
@@ -199,7 +199,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class DurationNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
index 62046379b9c..684287b7069 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -113,7 +113,8 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					};

+					}

+					;

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

 				if (result == null) {

@@ -156,6 +157,7 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 			}

 		}

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -187,7 +189,8 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 		} else if (borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else {

+		} else

+		{

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

@@ -212,6 +215,7 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
index 2c9463b9df2..3fb0be0edad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
@@ -34,7 +34,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

@@ -60,8 +59,10 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

@@ -82,7 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class DurationObservationNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+public class DurationObservationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -226,7 +227,8 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -278,7 +280,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -310,7 +314,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -333,18 +339,21 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -386,7 +395,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -436,7 +447,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -448,7 +461,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -461,14 +476,17 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -476,6 +494,7 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -497,14 +516,15 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -541,7 +561,8 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -560,14 +581,17 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -577,7 +601,9 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -588,9 +614,14 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -671,6 +702,7 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -720,9 +752,11 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -744,7 +778,8 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -773,15 +808,18 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -808,6 +846,6 @@ public class DurationObservationNameEditPart extends LabelEditPart implements IT
 	 * @generated

 	 */

 	protected IFigure createFigurePrim() {

-		return new WrappingLabel();

+		return new PapyrusWrappingLabel();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
index 2e323eb2c91..3827807d4c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -230,7 +230,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -675,6 +705,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -724,9 +755,11 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -748,7 +781,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -777,15 +811,18 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
index d9cd9f7b465..4c929d124e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -126,6 +126,7 @@ public class EnumerationEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -154,12 +155,15 @@ public class EnumerationEditPart extends NamedElementEditPart {
 			((EnumerationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -231,6 +235,7 @@ public class EnumerationEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
index 819ca189c6c..2664aba9213 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -126,6 +126,7 @@ public class EnumerationEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -154,12 +155,15 @@ public class EnumerationEditPartCN extends NamedElementEditPart {
 			((EnumerationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

+

 		return false;

 	}

 

@@ -231,6 +235,7 @@ public class EnumerationEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index 2e19cafa718..16b4cf40e5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -96,6 +96,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index 6edd3ca7ddd..56aceab8dc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -96,6 +96,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -105,7 +106,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -121,7 +125,10 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
index be3e8f454e4..12397bf54ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
@@ -219,7 +219,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -675,6 +705,7 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -724,9 +755,11 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -748,7 +781,8 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -795,15 +829,18 @@ public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
index 8facf3db013..d1d9f3e9867 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
@@ -199,7 +199,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
index 15da36cbb62..aee074d372b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
@@ -199,7 +199,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index 6f8279899ba..2e8be0c4179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompa
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompa
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompa
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index e79c9ef5ab3..eaefbc9b464 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCom
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCom
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCom
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index 54cfe0618e9..b05f3a77e75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -140,6 +140,7 @@ public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -168,18 +169,25 @@ public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
 			((ExecutionEnvironmentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -258,6 +266,7 @@ public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index b3433ebd626..60f070ebe8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -140,6 +140,7 @@ public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPar
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -168,18 +169,25 @@ public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPar
 			((ExecutionEnvironmentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -258,6 +266,7 @@ public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPar
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
index 0d70f09e32c..696498f2f6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
index f4600ebb870..9c47f6047c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
index 9957251b0ec..c7e485d78b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -131,6 +131,8 @@ public class ExpressionEditPart extends NodeEditPart {
 			((ExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class ExpressionEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
index 366c41dee28..63d5429ae3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
@@ -199,7 +199,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implement
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
index a77861edbba..dbb68e077b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartme
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartme
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartme
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
index beb68313376..20977f1b6f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompart
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompart
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index d8611a9bad8..7ca45577d97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -141,6 +141,7 @@ public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {
 			((FunctionBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index 0f5e8a54ef9..6b3fe5a6bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {
 			((FunctionBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
index 41872dbe2e1..d18dd3ce735 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
index a2ebb84403e..f895fb833b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index 58029503b30..e268164cb42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6024;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public GeneralizationAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6024;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public GeneralizationAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
index a76d1f5bd63..a27cda73ddd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
@@ -54,7 +54,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

-			((GeneralizationAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((GeneralizationAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
index 53c530cd881..5448fb48f0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6032;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));

-	}

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6032;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));
+	}
+
+	/**
+	 * @generated
+	 */
+	public InformationFlowAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
index 6eb96e45e1e..1114c1cd725 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
@@ -1,793 +1,832 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6031;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public InformationFlowConveyedLabelEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		EObject element = resolveSemanticElement();

-		return element != null ? element : (View) getModel();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6031;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public InformationFlowConveyedLabelEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		EObject element = resolveSemanticElement();
+		return element != null ? element : (View) getModel();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
index 261061e8277..4068d7dc1d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
@@ -54,10 +54,12 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {

-			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConveyedLabel());

+			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(

+					getPrimaryShape().getConveyedLabel());

 		}

 		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

-			((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
index 1313aaca629..86d7a57ecdf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -116,6 +116,7 @@ public class InformationItemEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class InformationItemEditPart extends NamedElementEditPart {
 			((InformationItemNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -207,6 +210,7 @@ public class InformationItemEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
index df727bd1da5..cc8d167b5cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -116,6 +116,7 @@ public class InformationItemEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class InformationItemEditPartCN extends NamedElementEditPart {
 			((InformationItemNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -207,6 +210,7 @@ public class InformationItemEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
index cbc370675e8..4b49f2b5ca7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
@@ -199,7 +199,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
index f564a4fd932..cf23990182e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
@@ -199,7 +199,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart im
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
index 28958d49f24..501c85997b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -131,6 +131,8 @@ public class InstanceValueEditPart extends NodeEditPart {
 			((InstanceValueNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class InstanceValueEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
index 9b6867e83fd..c8d6d5574b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
@@ -199,7 +199,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
index bfcd5070802..8fd036c7c0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEdi
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEdi
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEdi
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
index a486cf78ebb..cbcc84137b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentE
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentE
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentE
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 00852220bbc..ca67f70a70f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -141,6 +141,7 @@ public class InteractionCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class InteractionCompositeEditPart extends NamedElementEditPart {
 			((InteractionCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class InteractionCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index 1e09d9715c9..55baaf15192 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class InteractionCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class InteractionCompositeEditPartCN extends NamedElementEditPart {
 			((InteractionCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class InteractionCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
index e11316e78e3..57e11cf3d52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
index 527ba5f1387..4f8fd03dbf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPa
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index aa7f25924fe..80a57c549aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -112,6 +112,7 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 			((InteractionConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
index f7b9f2ff3c5..d2f79cbf6b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
@@ -112,6 +112,7 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 			((InteractionConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
index 1f81457745b..b64c9e5e665 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
@@ -199,7 +199,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
index dee74888973..22fd5a4a375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
@@ -199,7 +199,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
index 6374f51b5a7..df7439e1859 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
@@ -195,7 +195,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class InteractionConstraintSpecificationEditPart extends PapyrusCompartme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
index 0942d12670b..acc88b0ead5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
@@ -195,7 +195,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
index b878539c9d7..1d66ba231f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -118,6 +118,7 @@ public class InterfaceEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class InterfaceEditPart extends NamedElementEditPart {
 			((InterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class InterfaceEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
index 7941916c939..c898ea8d785 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -118,6 +118,7 @@ public class InterfaceEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class InterfaceEditPartCN extends NamedElementEditPart {
 			((InterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class InterfaceEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
index 68f8e5dc3de..1b86ba3c0a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
@@ -199,7 +199,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
index 9509af2ebf4..5bc5cbbed8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
@@ -199,7 +199,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index d19fb75b5fc..d13c3909c7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6016;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6016;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public InterfaceRealizationAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
index 48ae98840ed..2f94e063bb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
@@ -54,10 +54,12 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof InterfaceRealizationNameEditPart) {

-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((InterfaceRealizationNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

-			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
index 04db334f599..f111575af9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6002;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public InterfaceRealizationNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6002;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public InterfaceRealizationNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index 443551fefa9..a2271e035eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -112,6 +112,7 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 			((IntervalConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
index a63009464af..6137518de5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
@@ -112,6 +112,7 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 			((IntervalConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
index cd4a0eaad83..df8ea2ae3c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
@@ -199,7 +199,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart i
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
index 224f79fb0b9..d8e6c20773b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
@@ -199,7 +199,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
index 3352c87d36d..9df48119132 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
@@ -195,7 +195,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentE
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
index 94c5cd9bf0b..2a48fd0cbe0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
@@ -195,7 +195,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
index 394567d641c..b6f27354aa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
@@ -131,6 +131,8 @@ public class IntervalEditPart extends NodeEditPart {
 			((IntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class IntervalEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
index ab4c1c3fc5f..25618c4fe08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
@@ -199,7 +199,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index ee5d0dab36e..fdd874ec375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -131,6 +131,8 @@ public class LiteralBooleanEditPart extends NodeEditPart {
 			((LiteralBooleanNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class LiteralBooleanEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
index 8c605d90f72..bdcc3c9ff21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
@@ -199,7 +199,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index 32062478dc3..51274169406 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -131,6 +131,8 @@ public class LiteralIntegerEditPart extends NodeEditPart {
 			((LiteralIntegerNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class LiteralIntegerEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
index 7ffc281d3b6..4aeb9fb162f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
@@ -199,7 +199,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
index b40340dd4b7..cc320371fb0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -131,6 +131,8 @@ public class LiteralNullEditPart extends NodeEditPart {
 			((LiteralNullNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class LiteralNullEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
index c0917969042..fc3a1e2fc0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
@@ -199,7 +199,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
index 63253b4c204..5113d671b38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -131,6 +131,8 @@ public class LiteralStringEditPart extends NodeEditPart {
 			((LiteralStringNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class LiteralStringEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
index c659e3b2ea0..b3310c77d1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
@@ -199,7 +199,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index 9151df5fae6..32bb82558af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -131,6 +131,8 @@ public class LiteralUnlimitedNaturalEditPart extends NodeEditPart {
 			((LiteralUnlimitedNaturalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class LiteralUnlimitedNaturalEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
index d918109ed61..ae66e5256c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
@@ -199,7 +199,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
index dda4e01a1b8..448ad6ea697 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6019;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ManifestationAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6019;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ManifestationAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
index da0b48c0047..583776655ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
@@ -54,10 +54,12 @@ public class ManifestationEditPart extends UMLConnectionNodeEditPart implements
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof ManifestationNameEditPart) {

-			((ManifestationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((ManifestationNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

-			((ManifestationAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((ManifestationAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
index aebe886b6fa..a63cf45f9dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6005;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public ManifestationNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6005;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public ManifestationNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
index 3e060eba9a6..1f78bf78525 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
index 1270856d40c..2668f8a42c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
index f9ab47140f4..ae09d34aaa4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -142,6 +142,7 @@ public class NodeCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class NodeCompositeEditPart extends NamedElementEditPart {
 			((NodeCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class NodeCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index c7e8252f211..d1da4d99872 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -142,6 +142,7 @@ public class NodeCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -170,18 +171,25 @@ public class NodeCompositeEditPartCN extends NamedElementEditPart {
 			((NodeCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -260,6 +268,7 @@ public class NodeCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
index 022750ec81a..c4ddc52b041 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
index 40dc1dbce1f..dec1818a094 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
index 947c643cf38..747ca6ae0c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartment
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartment
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartment
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
index a33ebfaa24a..ef0dc3e5ea2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartme
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartme
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartme
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index 1104336c3e8..fdc61444632 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -141,6 +141,7 @@ public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {
 			((OpaqueBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index d51c6077ef9..4f90075b62a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {
 			((OpaqueBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
index 2139ccff5f8..7fad3c13a5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
index 9904539f58c..238bc2dfb77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index 3cbebd3c62f..e230eed2742 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -131,6 +131,8 @@ public class OpaqueExpressionEditPart extends NodeEditPart {
 			((OpaqueExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class OpaqueExpressionEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
index 1471eb7ecf6..f32fbe23cd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
@@ -199,7 +199,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
index f480f112921..514da82fe40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
@@ -219,7 +219,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -675,6 +705,7 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -724,9 +755,11 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -748,7 +781,8 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -795,15 +829,18 @@ public class OperationEditPartCLN extends CompartmentEditPart implements ITextAw
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
index 180ead23110..e999d97efa9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
@@ -34,7 +34,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

@@ -60,6 +59,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

@@ -85,7 +85,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+public class ParameterAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -230,7 +230,8 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -717,9 +747,11 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -741,7 +773,8 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -770,15 +803,18 @@ public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
index 3c3bc0da8d5..7619295f37f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
@@ -116,7 +116,8 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					};

+					}

+					;

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

 				if (result == null) {

@@ -159,6 +160,7 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 			}

 		}

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -189,7 +191,8 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 		} else if (borderItemEditPart instanceof ParameterAppliedStereotypeEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else {

+		} else

+		{

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

@@ -218,6 +221,7 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 		figure.add(shape);

 		contentPane = setupContentPane(shape);

 		return figure;

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
index f22e89b6fcb..4923306d8cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
@@ -34,7 +34,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

@@ -61,6 +60,7 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

@@ -85,7 +85,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+public class ParameterNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -230,7 +230,8 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -292,7 +293,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -324,7 +327,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -347,18 +352,21 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -400,7 +408,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -450,7 +460,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -462,7 +474,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -475,14 +489,17 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -490,6 +507,7 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -511,14 +529,15 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -555,7 +574,8 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -574,14 +594,17 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -591,7 +614,9 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -602,9 +627,14 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -685,6 +715,7 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -734,9 +765,11 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -758,7 +791,8 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -787,15 +821,18 @@ public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEd
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
index 0a777543b0e..d9b8e16e672 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
@@ -230,7 +230,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -717,9 +747,11 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -741,7 +773,8 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -770,15 +803,18 @@ public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
index 9c7bc91b242..e86843e5c21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
@@ -121,7 +121,8 @@ public class PortEditPart extends AbstractBorderEditPart {
 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					};

+					}

+					;

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

 				if (result == null) {

@@ -164,6 +165,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			}

 		}

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -194,7 +196,8 @@ public class PortEditPart extends AbstractBorderEditPart {
 		} else if (borderItemEditPart instanceof PortAppliedStereotypeEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else {

+		} else

+		{

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

@@ -223,6 +226,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 		figure.add(shape);

 		contentPane = setupContentPane(shape);

 		return figure;

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
index 7bae40e14cc..ac85ff017e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
@@ -34,7 +34,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

@@ -61,9 +60,11 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IndirectPortLabelEditPolicy;

@@ -86,7 +87,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+public class PortNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -232,7 +233,8 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -294,7 +296,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -326,7 +330,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -349,18 +355,21 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -402,7 +411,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -452,7 +463,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -464,7 +477,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -477,14 +492,17 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -492,6 +510,7 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -513,14 +532,15 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -557,7 +577,8 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -576,14 +597,17 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -593,7 +617,9 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -604,9 +630,14 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -687,6 +718,7 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -736,9 +768,11 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -760,7 +794,8 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -789,15 +824,18 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -824,6 +862,6 @@ public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPar
 	 * @generated

 	 */

 	protected IFigure createFigurePrim() {

-		return new WrappingLabel();

+		return new PapyrusWrappingLabel();

 	}

-}

+}
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index d31e2084e0f..ed2a5641404 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -118,6 +118,7 @@ public class PrimitiveTypeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class PrimitiveTypeEditPart extends NamedElementEditPart {
 			((PrimitiveTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class PrimitiveTypeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index 9175b97ee08..bfae76f7b3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -118,6 +118,7 @@ public class PrimitiveTypeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -146,6 +147,8 @@ public class PrimitiveTypeEditPartCN extends NamedElementEditPart {
 			((PrimitiveTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -209,6 +212,7 @@ public class PrimitiveTypeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
index d9c4c06003b..3bef3b162ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
@@ -199,7 +199,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
index 1b558038b43..169ff1378cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
index 00270e17f59..68c77a46258 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
@@ -219,7 +219,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -675,6 +705,7 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -724,9 +755,11 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -748,7 +781,8 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -795,15 +829,18 @@ public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwa
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
index 2276c5262b3..df70e0bf37e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
@@ -94,6 +94,7 @@ public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -103,7 +104,10 @@ public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -119,7 +123,10 @@ public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index f55a0974dbb..0749986f396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -148,6 +148,7 @@ public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -176,18 +177,25 @@ public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {
 			((PropertyPartNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -266,6 +274,7 @@ public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
index 9f682f71d32..ea515462c86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
@@ -201,7 +201,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -264,7 +265,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -296,7 +299,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -319,18 +324,21 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -372,7 +380,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -422,7 +432,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -434,7 +446,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -447,14 +461,17 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -462,6 +479,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -483,14 +501,15 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -527,7 +546,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -546,14 +566,17 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -563,7 +586,9 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -574,9 +599,14 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -657,6 +687,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -706,9 +737,11 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -730,7 +763,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -778,15 +812,18 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -829,7 +866,8 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -839,6 +877,7 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -846,5 +885,6 @@ public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
index 371d2b0f6f0..0ea025d3586 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompa
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompa
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompa
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
index 3376bb7776d..99926bfc7f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCom
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCom
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCom
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index 0496cf31733..22de104ad8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -141,6 +141,7 @@ public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
 			((ProtocolStateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index cd69146a38c..025f5cca13a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPar
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPar
 			((ProtocolStateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPar
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
index 7cd09bf3517..f0d3bfd00f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
index 0a3af282d8f..a49edfc1f8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartm
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
index 94ba1ded865..5a4e70011e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6018;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public RealizationAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6018;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public RealizationAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
index a93f42082d0..5e6588a9349 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
@@ -54,10 +54,12 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RealizationNameEditPart) {

-			((RealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((RealizationNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {

-			((RealizationAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((RealizationAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
index fa0fc1ba6e7..4d9aa254d48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6004;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public RealizationNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6004;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public RealizationNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
index 089a3265448..e321f572bdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
@@ -51,7 +51,8 @@ public class RepresentationEditPart extends UMLConnectionNodeEditPart implements
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RepresentationTagLabelEditPart) {

-			((RepresentationTagLabelEditPart) childEditPart).setLabel(getPrimaryShape().getTagLabel());

+			((RepresentationTagLabelEditPart) childEditPart).setLabel(

+					getPrimaryShape().getTagLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
index 957dec5a908..d501e5c337a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
@@ -1,790 +1,829 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6030;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID), new Point(0, 15));

-	}

-

-	/**

-	 * @generated

-	 */

-	public RepresentationTagLabelEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		EObject element = resolveSemanticElement();

-		return element != null ? element : (View) getModel();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItemRepresented_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6030;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID), new Point(0, 15));
+	}
+
+	/**
+	 * @generated
+	 */
+	public RepresentationTagLabelEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		EObject element = resolveSemanticElement();
+		return element != null ? element : (View) getModel();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItemRepresented_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
index ab0f80b4187..77252a489c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6028;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public RoleBindingAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6028;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public RoleBindingAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
index 55834197c66..af18eccd67e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
@@ -54,10 +54,12 @@ public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements IT
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof RoleBindingRoleNameEditPart) {

-			((RoleBindingRoleNameEditPart) childEditPart).setLabel(getPrimaryShape().getRoleLabel());

+			((RoleBindingRoleNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getRoleLabel());

 		}

 		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

-			((RoleBindingAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((RoleBindingAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
index d8b5eda34c3..7052ee92e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6027;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID), new Point(0, 20));

-	}

-

-	/**

-	 * @generated

-	 */

-	public RoleBindingRoleNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.SOURCE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6027;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID), new Point(0, 20));
+	}
+
+	/**
+	 * @generated
+	 */
+	public RoleBindingRoleNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.SOURCE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
index 9e014271ac6..1411fb309a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
@@ -114,6 +114,7 @@ public class SignalEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -142,6 +143,8 @@ public class SignalEditPart extends NamedElementEditPart {
 			((SignalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -205,6 +208,7 @@ public class SignalEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
index 34f9c12c4d9..c105c82a805 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -114,6 +114,7 @@ public class SignalEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -142,6 +143,8 @@ public class SignalEditPartCN extends NamedElementEditPart {
 			((SignalNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -205,6 +208,7 @@ public class SignalEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
index 20da6e888b0..812808355c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -131,6 +131,8 @@ public class SignalEventEditPart extends NodeEditPart {
 			((SignalEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class SignalEventEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
index 5318ac3b5d3..67f54a5c000 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
@@ -199,7 +199,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implemen
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
index efadb83a346..5906a978eca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
@@ -199,7 +199,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart implements IT
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
index e836cb75665..d085b7bd23a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
@@ -199,7 +199,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
index 98ee73865d9..1b7e3967009 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
@@ -92,6 +92,7 @@ public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEd
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEd
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEd
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
index d506ac08390..4e083df39be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
@@ -92,6 +92,7 @@ public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartment
 	 */

 	@Override

 	public EditPart getTargetEditPart(Request request) {

+

 		return super.getTargetEditPart(request);

 	}

 

@@ -101,7 +102,10 @@ public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartment
 	@Override

 	protected void handleNotificationEvent(Notification notification) {

 		Object feature = notification.getFeature();

-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)

+				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)

+				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

 			refreshBounds();

 		}

 		super.handleNotificationEvent(notification);

@@ -117,7 +121,10 @@ public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartment
 		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

 		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		Point loc = new Point(x, y);

-		((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+		((GraphicalEditPart) getParent()).setLayoutConstraint(

+				this,

+				getFigure(),

+				new Rectangle(loc, size));

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index 575afc1d8fc..120a7181030 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -141,6 +141,7 @@ public class StateMachineCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class StateMachineCompositeEditPart extends NamedElementEditPart {
 			((StateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class StateMachineCompositeEditPart extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index ad64d6029a7..94b60c0a2f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -141,6 +141,7 @@ public class StateMachineCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -169,24 +170,35 @@ public class StateMachineCompositeEditPartCN extends NamedElementEditPart {
 			((StateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

 			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

 			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way

 			pane.add(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof PortEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

-		// Papyrus Gencode :Affixed Port locator

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

 		if (childEditPart instanceof ParameterEditPart) {

 			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -269,6 +281,7 @@ public class StateMachineCompositeEditPartCN extends NamedElementEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
index d227f52a60e..791865fd53b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
@@ -199,7 +199,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPar
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
index 981bc102443..0369c5e288a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
@@ -199,7 +199,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
index 38c5b1e12fa..533006860ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -131,6 +131,8 @@ public class StringExpressionEditPart extends NodeEditPart {
 			((StringExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class StringExpressionEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
index 9b5de3b6f6c..16620132cee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
@@ -199,7 +199,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index 0b9eb15f609..64753af0281 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6017;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6017;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public SubstitutionAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
index 9c660f6f6c5..3b3eb5ca3ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
@@ -54,10 +54,12 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof SubstitutionNameEditPart) {

-			((SubstitutionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((SubstitutionNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

-			((SubstitutionAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((SubstitutionAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
index 03e844b2a0d..2f6a291f336 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6003;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public SubstitutionNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6003;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public SubstitutionNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
index 6310594b793..f9b3ebc24a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -112,6 +112,7 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 			((TimeConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
index 19855775c38..3c518c8b340 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
@@ -112,6 +112,7 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected void handleNotificationEvent(Notification event) {

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -144,6 +145,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 			((TimeConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -210,6 +213,7 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
index 0c5721a5c80..ece93d5a1a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
@@ -199,7 +199,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
index 7c4373e67b5..75c20cea497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
@@ -199,7 +199,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart imp
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
index 046040bb64f..ccaa6d1455a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
@@ -195,7 +195,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditP
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
index 36b5c2023a0..26ebfd674b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
@@ -195,7 +195,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -248,7 +249,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -280,7 +283,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -303,18 +308,21 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -356,7 +364,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -406,7 +416,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -418,7 +430,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -431,14 +445,17 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -446,6 +463,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -467,14 +485,15 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -511,7 +530,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -530,14 +550,17 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -547,7 +570,9 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -558,9 +583,14 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -641,6 +671,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -690,9 +721,11 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -714,7 +747,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -762,15 +796,18 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -810,7 +847,8 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -820,6 +858,7 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -827,5 +866,6 @@ public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEdi
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
index 0e5f5d65ffe..e93ff5ba470 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -131,6 +131,8 @@ public class TimeEventEditPart extends NodeEditPart {
 			((TimeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class TimeEventEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
index 0ec511e69a8..85c4ac3761c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
@@ -199,7 +199,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
index d3db7594673..03d8a0a3424 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -131,6 +131,8 @@ public class TimeExpressionEditPart extends NodeEditPart {
 			((TimeExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class TimeExpressionEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
index 87d15ff68e9..9bfb2391885 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
@@ -199,7 +199,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart imple
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
index ba12e5f5183..eb1db699e2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -131,6 +131,8 @@ public class TimeIntervalEditPart extends NodeEditPart {
 			((TimeIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -194,6 +196,7 @@ public class TimeIntervalEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
index ff990ff901f..cd48acea371 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
@@ -199,7 +199,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart impleme
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
index b9097564dc1..28edd2aabd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -113,7 +113,8 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 							mh.setBorder(null);

 							return Collections.singletonList(mh);

 						}

-					};

+					}

+					;

 				}

 				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

 				if (result == null) {

@@ -156,6 +157,7 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 			}

 		}

 		super.handleNotificationEvent(event);

+

 	}

 

 	/**

@@ -187,7 +189,8 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 		} else if (borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {

 			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

 			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

-		} else {

+		} else

+		{

 			super.addBorderItem(borderItemContainer, borderItemEditPart);

 		}

 	}

@@ -212,6 +215,7 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 	@Override

 	protected NodeFigure createMainFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
index f9635025ca7..71d063b8e08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
@@ -34,7 +34,6 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

@@ -60,8 +59,10 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;

 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

@@ -82,7 +83,7 @@ import org.eclipse.uml2.uml.Feature;
 /**

  * @generated

  */

-public class TimeObservationNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+public class TimeObservationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

 

 	/**

 	 * @generated

@@ -226,7 +227,8 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -278,7 +280,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -310,7 +314,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -333,18 +339,21 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -386,7 +395,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -436,7 +447,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -448,7 +461,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -461,14 +476,17 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -476,6 +494,7 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -497,14 +516,15 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -541,7 +561,8 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -560,14 +581,17 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -577,7 +601,9 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -588,9 +614,14 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -671,6 +702,7 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -720,9 +752,11 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -744,7 +778,8 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -773,15 +808,18 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -808,6 +846,6 @@ public class TimeObservationNameEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	protected IFigure createFigurePrim() {

-		return new WrappingLabel();

+		return new PapyrusWrappingLabel();

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
index 8b5aae2902c..a747c32de21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -230,7 +230,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -282,7 +283,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -314,7 +317,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -337,18 +342,21 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -390,7 +398,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -440,7 +450,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -452,7 +464,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -465,14 +479,17 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -480,6 +497,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -501,14 +519,15 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -545,7 +564,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -564,14 +584,17 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -581,7 +604,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -592,9 +617,14 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -675,6 +705,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -724,9 +755,11 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -748,7 +781,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -777,15 +811,18 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
index 54461dbaa9d..d43495b8e2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
@@ -38,530 +38,812 @@ public class UMLEditPartFactory implements EditPartFactory {
 		if (model instanceof View) {

 			View view = (View) model;

 			switch (UMLVisualIDRegistry.getVisualID(view)) {

+

 			case CompositeStructureDiagramEditPart.VISUAL_ID:

 				return new CompositeStructureDiagramEditPart(view);

+

 			case ActivityCompositeEditPart.VISUAL_ID:

 				return new ActivityCompositeEditPart(view);

+

 			case ActivityCompositeNameEditPart.VISUAL_ID:

 				return new ActivityCompositeNameEditPart(view);

+

 			case InteractionCompositeEditPart.VISUAL_ID:

 				return new InteractionCompositeEditPart(view);

+

 			case InteractionCompositeNameEditPart.VISUAL_ID:

 				return new InteractionCompositeNameEditPart(view);

+

 			case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeEditPart(view);

+

 			case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeNameEditPart(view);

+

 			case StateMachineCompositeEditPart.VISUAL_ID:

 				return new StateMachineCompositeEditPart(view);

+

 			case StateMachineCompositeNameEditPart.VISUAL_ID:

 				return new StateMachineCompositeNameEditPart(view);

+

 			case FunctionBehaviorCompositeEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeEditPart(view);

+

 			case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeNameEditPart(view);

+

 			case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeEditPart(view);

+

 			case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeNameEditPart(view);

+

 			case ComponentCompositeEditPart.VISUAL_ID:

 				return new ComponentCompositeEditPart(view);

+

 			case ComponentCompositeNameEditPart.VISUAL_ID:

 				return new ComponentCompositeNameEditPart(view);

+

 			case DeviceCompositeEditPart.VISUAL_ID:

 				return new DeviceCompositeEditPart(view);

+

 			case DeviceCompositeNameEditPart.VISUAL_ID:

 				return new DeviceCompositeNameEditPart(view);

+

 			case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeEditPart(view);

+

 			case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeNameEditPart(view);

+

 			case NodeCompositeEditPart.VISUAL_ID:

 				return new NodeCompositeEditPart(view);

+

 			case NodeCompositeNameEditPart.VISUAL_ID:

 				return new NodeCompositeNameEditPart(view);

+

 			case ClassCompositeEditPart.VISUAL_ID:

 				return new ClassCompositeEditPart(view);

+

 			case ClassCompositeNameEditPart.VISUAL_ID:

 				return new ClassCompositeNameEditPart(view);

+

 			case CollaborationCompositeEditPart.VISUAL_ID:

 				return new CollaborationCompositeEditPart(view);

+

 			case CollaborationCompositeNameEditPart.VISUAL_ID:

 				return new CollaborationCompositeNameEditPart(view);

+

 			case InterfaceEditPart.VISUAL_ID:

 				return new InterfaceEditPart(view);

+

 			case InterfaceNameEditPart.VISUAL_ID:

 				return new InterfaceNameEditPart(view);

+

 			case PrimitiveTypeEditPart.VISUAL_ID:

 				return new PrimitiveTypeEditPart(view);

+

 			case PrimitiveTypeNameEditPart.VISUAL_ID:

 				return new PrimitiveTypeNameEditPart(view);

+

 			case EnumerationEditPart.VISUAL_ID:

 				return new EnumerationEditPart(view);

+

 			case EnumerationNameEditPart.VISUAL_ID:

 				return new EnumerationNameEditPart(view);

+

 			case DataTypeEditPart.VISUAL_ID:

 				return new DataTypeEditPart(view);

+

 			case DataTypeNameEditPart.VISUAL_ID:

 				return new DataTypeNameEditPart(view);

+

 			case ActorEditPart.VISUAL_ID:

 				return new ActorEditPart(view);

+

 			case ActorNameEditPart.VISUAL_ID:

 				return new ActorNameEditPart(view);

+

 			case DeploymentSpecificationEditPart.VISUAL_ID:

 				return new DeploymentSpecificationEditPart(view);

+

 			case DeploymentSpecificationNameEditPart.VISUAL_ID:

 				return new DeploymentSpecificationNameEditPart(view);

+

 			case ArtifactEditPart.VISUAL_ID:

 				return new ArtifactEditPart(view);

+

 			case ArtifactNameEditPart.VISUAL_ID:

 				return new ArtifactNameEditPart(view);

+

 			case InformationItemEditPart.VISUAL_ID:

 				return new InformationItemEditPart(view);

+

 			case InformationItemNameEditPart.VISUAL_ID:

 				return new InformationItemNameEditPart(view);

+

 			case SignalEditPart.VISUAL_ID:

 				return new SignalEditPart(view);

+

 			case SignalNameEditPart.VISUAL_ID:

 				return new SignalNameEditPart(view);

+

 			case UseCaseEditPart.VISUAL_ID:

 				return new UseCaseEditPart(view);

+

 			case UseCaseNameEditPart.VISUAL_ID:

 				return new UseCaseNameEditPart(view);

+

 			case SignalEventEditPart.VISUAL_ID:

 				return new SignalEventEditPart(view);

+

 			case SignalEventNameEditPart.VISUAL_ID:

 				return new SignalEventNameEditPart(view);

+

 			case CallEventEditPart.VISUAL_ID:

 				return new CallEventEditPart(view);

+

 			case CallEventNameEditPart.VISUAL_ID:

 				return new CallEventNameEditPart(view);

+

 			case AnyReceiveEventEditPart.VISUAL_ID:

 				return new AnyReceiveEventEditPart(view);

+

 			case AnyReceiveEventNameEditPart.VISUAL_ID:

 				return new AnyReceiveEventNameEditPart(view);

+

 			case ChangeEventEditPart.VISUAL_ID:

 				return new ChangeEventEditPart(view);

+

 			case ChangeEventNameEditPart.VISUAL_ID:

 				return new ChangeEventNameEditPart(view);

+

 			case TimeEventEditPart.VISUAL_ID:

 				return new TimeEventEditPart(view);

+

 			case TimeEventNameEditPart.VISUAL_ID:

 				return new TimeEventNameEditPart(view);

+

 			case DurationObservationEditPart.VISUAL_ID:

 				return new DurationObservationEditPart(view);

+

 			case DurationObservationNameEditPart.VISUAL_ID:

 				return new DurationObservationNameEditPart(view);

+

 			case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

 				return new DurationObservationStereotypeLabelEditPart(view);

+

 			case TimeObservationEditPart.VISUAL_ID:

 				return new TimeObservationEditPart(view);

+

 			case TimeObservationNameEditPart.VISUAL_ID:

 				return new TimeObservationNameEditPart(view);

+

 			case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

 				return new TimeObservationStereotypeLabelEditPart(view);

+

 			case LiteralBooleanEditPart.VISUAL_ID:

 				return new LiteralBooleanEditPart(view);

+

 			case LiteralBooleanNameEditPart.VISUAL_ID:

 				return new LiteralBooleanNameEditPart(view);

+

 			case LiteralIntegerEditPart.VISUAL_ID:

 				return new LiteralIntegerEditPart(view);

+

 			case LiteralIntegerNameEditPart.VISUAL_ID:

 				return new LiteralIntegerNameEditPart(view);

+

 			case LiteralNullEditPart.VISUAL_ID:

 				return new LiteralNullEditPart(view);

+

 			case LiteralNullNameEditPart.VISUAL_ID:

 				return new LiteralNullNameEditPart(view);

+

 			case LiteralStringEditPart.VISUAL_ID:

 				return new LiteralStringEditPart(view);

+

 			case LiteralStringNameEditPart.VISUAL_ID:

 				return new LiteralStringNameEditPart(view);

+

 			case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

 				return new LiteralUnlimitedNaturalEditPart(view);

+

 			case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

 				return new LiteralUnlimitedNaturalNameEditPart(view);

+

 			case StringExpressionEditPart.VISUAL_ID:

 				return new StringExpressionEditPart(view);

+

 			case StringExpressionNameEditPart.VISUAL_ID:

 				return new StringExpressionNameEditPart(view);

+

 			case OpaqueExpressionEditPart.VISUAL_ID:

 				return new OpaqueExpressionEditPart(view);

+

 			case OpaqueExpressionNameEditPart.VISUAL_ID:

 				return new OpaqueExpressionNameEditPart(view);

+

 			case TimeExpressionEditPart.VISUAL_ID:

 				return new TimeExpressionEditPart(view);

+

 			case TimeExpressionNameEditPart.VISUAL_ID:

 				return new TimeExpressionNameEditPart(view);

+

 			case ExpressionEditPart.VISUAL_ID:

 				return new ExpressionEditPart(view);

+

 			case ExpressionNameEditPart.VISUAL_ID:

 				return new ExpressionNameEditPart(view);

+

 			case DurationEditPart.VISUAL_ID:

 				return new DurationEditPart(view);

+

 			case DurationNameEditPart.VISUAL_ID:

 				return new DurationNameEditPart(view);

+

 			case TimeIntervalEditPart.VISUAL_ID:

 				return new TimeIntervalEditPart(view);

+

 			case TimeIntervalNameEditPart.VISUAL_ID:

 				return new TimeIntervalNameEditPart(view);

+

 			case DurationIntervalEditPart.VISUAL_ID:

 				return new DurationIntervalEditPart(view);

+

 			case DurationIntervalNameEditPart.VISUAL_ID:

 				return new DurationIntervalNameEditPart(view);

+

 			case IntervalEditPart.VISUAL_ID:

 				return new IntervalEditPart(view);

+

 			case IntervalNameEditPart.VISUAL_ID:

 				return new IntervalNameEditPart(view);

+

 			case InstanceValueEditPart.VISUAL_ID:

 				return new InstanceValueEditPart(view);

+

 			case InstanceValueNameEditPart.VISUAL_ID:

 				return new InstanceValueNameEditPart(view);

+

 			case CommentEditPart.VISUAL_ID:

 				return new CommentEditPart(view);

+

 			case CommentBodyEditPart.VISUAL_ID:

 				return new CommentBodyEditPart(view);

+

 			case DurationConstraintEditPart.VISUAL_ID:

 				return new DurationConstraintEditPart(view);

+

 			case DurationConstraintNameEditPart.VISUAL_ID:

 				return new DurationConstraintNameEditPart(view);

+

 			case DurationConstraintSpecificationEditPart.VISUAL_ID:

 				return new DurationConstraintSpecificationEditPart(view);

+

 			case TimeConstraintEditPart.VISUAL_ID:

 				return new TimeConstraintEditPart(view);

+

 			case TimeConstraintNameEditPart.VISUAL_ID:

 				return new TimeConstraintNameEditPart(view);

+

 			case TimeConstraintSpecificationEditPart.VISUAL_ID:

 				return new TimeConstraintSpecificationEditPart(view);

+

 			case IntervalConstraintEditPart.VISUAL_ID:

 				return new IntervalConstraintEditPart(view);

+

 			case IntervalConstraintNameEditPart.VISUAL_ID:

 				return new IntervalConstraintNameEditPart(view);

+

 			case IntervalConstraintSpecificationEditPart.VISUAL_ID:

 				return new IntervalConstraintSpecificationEditPart(view);

+

 			case InteractionConstraintEditPart.VISUAL_ID:

 				return new InteractionConstraintEditPart(view);

+

 			case InteractionConstraintNameEditPart.VISUAL_ID:

 				return new InteractionConstraintNameEditPart(view);

+

 			case InteractionConstraintSpecificationEditPart.VISUAL_ID:

 				return new InteractionConstraintSpecificationEditPart(view);

+

 			case ConstraintEditPart.VISUAL_ID:

 				return new ConstraintEditPart(view);

+

 			case ConstraintNameEditPart.VISUAL_ID:

 				return new ConstraintNameEditPart(view);

+

 			case ConstraintSpecificationEditPart.VISUAL_ID:

 				return new ConstraintSpecificationEditPart(view);

+

 			case BehaviorPortEditPart.VISUAL_ID:

 				return new BehaviorPortEditPart(view);

+

 			case PortEditPart.VISUAL_ID:

 				return new PortEditPart(view);

+

 			case PortNameEditPart.VISUAL_ID:

 				return new PortNameEditPart(view);

+

 			case PortAppliedStereotypeEditPart.VISUAL_ID:

 				return new PortAppliedStereotypeEditPart(view);

+

 			case ParameterEditPart.VISUAL_ID:

 				return new ParameterEditPart(view);

+

 			case ParameterNameEditPart.VISUAL_ID:

 				return new ParameterNameEditPart(view);

+

 			case ParameterAppliedStereotypeEditPart.VISUAL_ID:

 				return new ParameterAppliedStereotypeEditPart(view);

+

 			case PropertyPartEditPartCN.VISUAL_ID:

 				return new PropertyPartEditPartCN(view);

+

 			case PropertyPartNameEditPartCN.VISUAL_ID:

 				return new PropertyPartNameEditPartCN(view);

+

 			case CollaborationRoleEditPartCN.VISUAL_ID:

 				return new CollaborationRoleEditPartCN(view);

+

 			case CollaborationRoleNameEditPartCN.VISUAL_ID:

 				return new CollaborationRoleNameEditPartCN(view);

+

 			case CollaborationUseEditPartCN.VISUAL_ID:

 				return new CollaborationUseEditPartCN(view);

+

 			case CollaborationUseNameEditPart.VISUAL_ID:

 				return new CollaborationUseNameEditPart(view);

+

 			case ActivityCompositeEditPartCN.VISUAL_ID:

 				return new ActivityCompositeEditPartCN(view);

+

 			case ActivityCompositeNameEditPartCN.VISUAL_ID:

 				return new ActivityCompositeNameEditPartCN(view);

+

 			case InteractionCompositeEditPartCN.VISUAL_ID:

 				return new InteractionCompositeEditPartCN(view);

+

 			case InteractionCompositeNameEditPartCN.VISUAL_ID:

 				return new InteractionCompositeNameEditPartCN(view);

+

 			case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeEditPartCN(view);

+

 			case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeNameEditPartCN(view);

+

 			case StateMachineCompositeEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeEditPartCN(view);

+

 			case StateMachineCompositeNameEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeNameEditPartCN(view);

+

 			case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeEditPartCN(view);

+

 			case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeNameEditPartCN(view);

+

 			case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeEditPartCN(view);

+

 			case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeNameEditPartCN(view);

+

 			case ComponentCompositeEditPartCN.VISUAL_ID:

 				return new ComponentCompositeEditPartCN(view);

+

 			case ComponentCompositeNameEditPartCN.VISUAL_ID:

 				return new ComponentCompositeNameEditPartCN(view);

+

 			case DeviceCompositeEditPartCN.VISUAL_ID:

 				return new DeviceCompositeEditPartCN(view);

+

 			case DeviceCompositeNameEditPartCN.VISUAL_ID:

 				return new DeviceCompositeNameEditPartCN(view);

+

 			case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeEditPartCN(view);

+

 			case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeNameEditPartCN(view);

+

 			case NodeCompositeEditPartCN.VISUAL_ID:

 				return new NodeCompositeEditPartCN(view);

+

 			case NodeCompositeNameEditPartCN.VISUAL_ID:

 				return new NodeCompositeNameEditPartCN(view);

+

 			case ClassCompositeEditPartCN.VISUAL_ID:

 				return new ClassCompositeEditPartCN(view);

+

 			case ClassCompositeNameEditPartCN.VISUAL_ID:

 				return new ClassCompositeNameEditPartCN(view);

+

 			case CollaborationCompositeEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeEditPartCN(view);

+

 			case CollaborationCompositeNameEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeNameEditPartCN(view);

+

 			case InterfaceEditPartCN.VISUAL_ID:

 				return new InterfaceEditPartCN(view);

+

 			case InterfaceNameEditPartCN.VISUAL_ID:

 				return new InterfaceNameEditPartCN(view);

+

 			case PrimitiveTypeEditPartCN.VISUAL_ID:

 				return new PrimitiveTypeEditPartCN(view);

+

 			case PrimitiveTypeNameEditPartCN.VISUAL_ID:

 				return new PrimitiveTypeNameEditPartCN(view);

+

 			case EnumerationEditPartCN.VISUAL_ID:

 				return new EnumerationEditPartCN(view);

+

 			case EnumerationNameEditPartCN.VISUAL_ID:

 				return new EnumerationNameEditPartCN(view);

+

 			case DataTypeEditPartCN.VISUAL_ID:

 				return new DataTypeEditPartCN(view);

+

 			case DataTypeNameEditPartCN.VISUAL_ID:

 				return new DataTypeNameEditPartCN(view);

+

 			case ActorEditPartCN.VISUAL_ID:

 				return new ActorEditPartCN(view);

+

 			case ActorNameEditPartCN.VISUAL_ID:

 				return new ActorNameEditPartCN(view);

+

 			case DeploymentSpecificationEditPartCN.VISUAL_ID:

 				return new DeploymentSpecificationEditPartCN(view);

+

 			case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

 				return new DeploymentSpecificationNameEditPartCN(view);

+

 			case ArtifactEditPartCN.VISUAL_ID:

 				return new ArtifactEditPartCN(view);

+

 			case ArtifactNameEditPartCN.VISUAL_ID:

 				return new ArtifactNameEditPartCN(view);

+

 			case InformationItemEditPartCN.VISUAL_ID:

 				return new InformationItemEditPartCN(view);

+

 			case InformationItemNameEditPartCN.VISUAL_ID:

 				return new InformationItemNameEditPartCN(view);

+

 			case SignalEditPartCN.VISUAL_ID:

 				return new SignalEditPartCN(view);

+

 			case SignalNameEditPartCN.VISUAL_ID:

 				return new SignalNameEditPartCN(view);

+

 			case UseCaseEditPartCN.VISUAL_ID:

 				return new UseCaseEditPartCN(view);

+

 			case UseCaseNameEditPartCN.VISUAL_ID:

 				return new UseCaseNameEditPartCN(view);

+

 			case CommentEditPartCN.VISUAL_ID:

 				return new CommentEditPartCN(view);

+

 			case CommentBodyEditPartCN.VISUAL_ID:

 				return new CommentBodyEditPartCN(view);

+

 			case DurationConstraintEditPartCN.VISUAL_ID:

 				return new DurationConstraintEditPartCN(view);

+

 			case DurationConstraintNameEditPartCN.VISUAL_ID:

 				return new DurationConstraintNameEditPartCN(view);

+

 			case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new DurationConstraintSpecificationEditPartCN(view);

+

 			case TimeConstraintEditPartCN.VISUAL_ID:

 				return new TimeConstraintEditPartCN(view);

+

 			case TimeConstraintNameEditPartCN.VISUAL_ID:

 				return new TimeConstraintNameEditPartCN(view);

+

 			case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new TimeConstraintSpecificationEditPartCN(view);

+

 			case IntervalConstraintEditPartCN.VISUAL_ID:

 				return new IntervalConstraintEditPartCN(view);

+

 			case IntervalConstraintNameEditPartCN.VISUAL_ID:

 				return new IntervalConstraintNameEditPartCN(view);

+

 			case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new IntervalConstraintSpecificationEditPartCN(view);

+

 			case InteractionConstraintEditPartCN.VISUAL_ID:

 				return new InteractionConstraintEditPartCN(view);

+

 			case InteractionConstraintNameEditPartCN.VISUAL_ID:

 				return new InteractionConstraintNameEditPartCN(view);

+

 			case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new InteractionConstraintSpecificationEditPartCN(view);

+

 			case ConstraintEditPartCN.VISUAL_ID:

 				return new ConstraintEditPartCN(view);

+

 			case ConstraintNameEditPartCN.VISUAL_ID:

 				return new ConstraintNameEditPartCN(view);

+

 			case ConstraintSpecificationEditPartCN.VISUAL_ID:

 				return new ConstraintSpecificationEditPartCN(view);

+

 			case PropertyEditPartCLN.VISUAL_ID:

 				return new PropertyEditPartCLN(view);

+

 			case OperationEditPartCLN.VISUAL_ID:

 				return new OperationEditPartCLN(view);

+

 			case EnumerationLiteralEditPartCLN.VISUAL_ID:

 				return new EnumerationLiteralEditPartCLN(view);

+

 			case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

 				return new DataTypeAttributeCompartmentEditPart(view);

+

 			case DataTypeOperationCompartmentEditPart.VISUAL_ID:

 				return new DataTypeOperationCompartmentEditPart(view);

+

 			case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

 				return new DataTypeAttributeCompartmentEditPartCN(view);

+

 			case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

 				return new DataTypeOperationCompartmentEditPartCN(view);

+

 			case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

 				return new EnumerationEnumerationLiteralCompartmentEditPart(view);

+

 			case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

 				return new EnumerationEnumerationLiteralCompartmentEditPartCN(view);

+

 			case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ActivityCompositeCompartmentEditPartCN(view);

+

 			case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new InteractionCompositeCompartmentEditPartCN(view);

+

 			case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ProtocolStateMachineCompositeCompartmentEditPartCN(view);

+

 			case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new StateMachineCompositeCompartmentEditPartCN(view);

+

 			case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new FunctionBehaviorCompositeCompartmentEditPartCN(view);

+

 			case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new OpaqueBehaviorCompositeCompartmentEditPartCN(view);

+

 			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ComponentCompositeCompartmentEditPartCN(view);

+

 			case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new DeviceCompositeCompartmentEditPartCN(view);

+

 			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeCompartmentEditPartCN(view);

+

 			case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new NodeCompositeCompartmentEditPartCN(view);

+

 			case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new ClassCompositeCompartmentEditPartCN(view);

+

 			case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

 				return new CollaborationCompositeCompartmentEditPartCN(view);

+

 			case ActivityCompositeCompartmentEditPart.VISUAL_ID:

 				return new ActivityCompositeCompartmentEditPart(view);

+

 			case InteractionCompositeCompartmentEditPart.VISUAL_ID:

 				return new InteractionCompositeCompartmentEditPart(view);

+

 			case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

 				return new ProtocolStateMachineCompositeCompartmentEditPart(view);

+

 			case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

 				return new StateMachineCompositeCompartmentEditPart(view);

+

 			case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

 				return new FunctionBehaviorCompositeCompartmentEditPart(view);

+

 			case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

 				return new OpaqueBehaviorCompositeCompartmentEditPart(view);

+

 			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 				return new ComponentCompositeCompartmentEditPart(view);

+

 			case DeviceCompositeCompartmentEditPart.VISUAL_ID:

 				return new DeviceCompositeCompartmentEditPart(view);

+

 			case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

 				return new ExecutionEnvironmentCompositeCompartmentEditPart(view);

+

 			case NodeCompositeCompartmentEditPart.VISUAL_ID:

 				return new NodeCompositeCompartmentEditPart(view);

+

 			case ClassCompositeCompartmentEditPart.VISUAL_ID:

 				return new ClassCompositeCompartmentEditPart(view);

+

 			case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

 				return new CollaborationCompositeCompartmentEditPart(view);

+

 			case PropertyPartCompartmentEditPartCN.VISUAL_ID:

 				return new PropertyPartCompartmentEditPartCN(view);

+

 			case BehaviorPortLinkEditPart.VISUAL_ID:

 				return new BehaviorPortLinkEditPart(view);

+

+

 			case LinkDescriptorEditPart.VISUAL_ID:

 				return new LinkDescriptorEditPart(view);

+

+

 			case CommentAnnotatedElementEditPart.VISUAL_ID:

 				return new CommentAnnotatedElementEditPart(view);

+

+

 			case ConstraintConstrainedElementEditPart.VISUAL_ID:

 				return new ConstraintConstrainedElementEditPart(view);

+

+

 			case ComponentRealizationEditPart.VISUAL_ID:

 				return new ComponentRealizationEditPart(view);

+

 			case ComponentRealizationNameEditPart.VISUAL_ID:

 				return new ComponentRealizationNameEditPart(view);

+

 			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ComponentRealizationAppliedStereotypeEditPart(view);

+

+

 			case InterfaceRealizationEditPart.VISUAL_ID:

 				return new InterfaceRealizationEditPart(view);

+

 			case InterfaceRealizationNameEditPart.VISUAL_ID:

 				return new InterfaceRealizationNameEditPart(view);

+

 			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new InterfaceRealizationAppliedStereotypeEditPart(view);

+

+

 			case SubstitutionEditPart.VISUAL_ID:

 				return new SubstitutionEditPart(view);

+

 			case SubstitutionNameEditPart.VISUAL_ID:

 				return new SubstitutionNameEditPart(view);

+

 			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

 				return new SubstitutionAppliedStereotypeEditPart(view);

+

+

 			case RealizationEditPart.VISUAL_ID:

 				return new RealizationEditPart(view);

+

 			case RealizationNameEditPart.VISUAL_ID:

 				return new RealizationNameEditPart(view);

+

 			case RealizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new RealizationAppliedStereotypeEditPart(view);

+

+

 			case ManifestationEditPart.VISUAL_ID:

 				return new ManifestationEditPart(view);

+

 			case ManifestationNameEditPart.VISUAL_ID:

 				return new ManifestationNameEditPart(view);

+

 			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 				return new ManifestationAppliedStereotypeEditPart(view);

+

+

 			case AbstractionEditPart.VISUAL_ID:

 				return new AbstractionEditPart(view);

+

 			case AbstractionNameEditPart.VISUAL_ID:

 				return new AbstractionNameEditPart(view);

+

 			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

 				return new AbstractionAppliedStereotypeEditPart(view);

+

+

 			case UsageEditPart.VISUAL_ID:

 				return new UsageEditPart(view);

+

 			case UsageNameEditPart.VISUAL_ID:

 				return new UsageNameEditPart(view);

+

 			case UsageAppliedStereotypeEditPart.VISUAL_ID:

 				return new UsageAppliedStereotypeEditPart(view);

+

+

 			case DeploymentEditPart.VISUAL_ID:

 				return new DeploymentEditPart(view);

+

 			case DeploymentNameEditPart.VISUAL_ID:

 				return new DeploymentNameEditPart(view);

+

 			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 				return new DeploymentAppliedStereotypeEditPart(view);

+

+

 			case RoleBindingEditPart.VISUAL_ID:

 				return new RoleBindingEditPart(view);

+

 			case RoleBindingRoleNameEditPart.VISUAL_ID:

 				return new RoleBindingRoleNameEditPart(view);

+

 			case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

 				return new RoleBindingAppliedStereotypeEditPart(view);

+

+

 			case DependencyEditPart.VISUAL_ID:

 				return new DependencyEditPart(view);

+

 			case DependencyNameEditPart.VISUAL_ID:

 				return new DependencyNameEditPart(view);

+

 			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 				return new DependencyAppliedStereotypeEditPart(view);

+

+

 			case ConnectorEditPart.VISUAL_ID:

 				return new ConnectorEditPart(view);

+

 			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

 				return new ConnectorAppliedStereotypeEditPart(view);

+

 			case ConnectorNameEditPart.VISUAL_ID:

 				return new ConnectorNameEditPart(view);

+

 			case ConnectorMultiplicitySourceEditPart.VISUAL_ID:

 				return new ConnectorMultiplicitySourceEditPart(view);

+

 			case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

 				return new ConnectorMultiplicityTargetEditPart(view);

+

+

 			case GeneralizationEditPart.VISUAL_ID:

 				return new GeneralizationEditPart(view);

+

 			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 				return new GeneralizationAppliedStereotypeEditPart(view);

+

+

 			case TimeObservationEventEditPart.VISUAL_ID:

 				return new TimeObservationEventEditPart(view);

+

+

 			case DurationObservationEventEditPart.VISUAL_ID:

 				return new DurationObservationEventEditPart(view);

+

+

 			case RepresentationEditPart.VISUAL_ID:

 				return new RepresentationEditPart(view);

+

 			case RepresentationTagLabelEditPart.VISUAL_ID:

 				return new RepresentationTagLabelEditPart(view);

+

+

 			case InformationFlowEditPart.VISUAL_ID:

 				return new InformationFlowEditPart(view);

+

 			case InformationFlowConveyedLabelEditPart.VISUAL_ID:

 				return new InformationFlowConveyedLabelEditPart(view);

+

 			case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

 				return new InformationFlowAppliedStereotypeEditPart(view);

+

 			}

 		}

 		return createUnrecognizedEditPart(context, model);

@@ -580,9 +862,12 @@ public class UMLEditPartFactory implements EditPartFactory {
 	 */

 	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

 		if (source.getFigure() instanceof IMultilineEditableFigure) {

-			return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure());

-		} else {

+			return new MultilineCellEditorLocator(

+					(IMultilineEditableFigure) source.getFigure());

+		}

+		else {

 			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

+

 		}

 	}

 

@@ -621,7 +906,8 @@ public class UMLEditPartFactory implements EditPartFactory {
 			rect.y = getMultilineEditableFigure().getEditionLocation().y;

 			getMultilineEditableFigure().translateToAbsolute(rect);

 			if (getMultilineEditableFigure().getText().length() > 0) {

-				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));

+				rect.setSize(new Dimension(text.computeSize(rect.width,

+						SWT.DEFAULT)));

 			}

 			if (!rect.equals(new Rectangle(text.getBounds()))) {

 				text.setBounds(rect.x, rect.y, rect.width, rect.height);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
index 8b31a19ded5..c6dd39a992a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -1,782 +1,820 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6021;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

-	}

-

-	/**

-	 * @generated

-	 */

-	public UsageAppliedStereotypeEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return false;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		// The label is read-only (defined in GMFGen model)

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6021;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
+	}
+
+	/**
+	 * @generated
+	 */
+	public UsageAppliedStereotypeEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		// The label is read-only (defined in GMFGen model)
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
index 6eea9686d61..38d185f7f47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
@@ -54,10 +54,12 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra
 	 */

 	protected boolean addFixedChild(EditPart childEditPart) {

 		if (childEditPart instanceof UsageNameEditPart) {

-			((UsageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			((UsageNameEditPart) childEditPart).setLabel(

+					getPrimaryShape().getNameLabel());

 		}

 		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {

-			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(

+					getPrimaryShape().getAppliedStereotypeLabel());

 		}

 		return false;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
index 404de5e7e45..aaa81295957 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
@@ -1,789 +1,828 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.IFigure;

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.AccessibleEditPart;

-import org.eclipse.gef.EditPolicy;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.requests.DirectEditRequest;

-import org.eclipse.gef.tools.DirectEditManager;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

-import org.eclipse.gmf.runtime.notation.FontStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.viewers.ICellEditorValidator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.editors.Activator;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.AccessibleEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.FontData;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.uml2.uml.Feature;

-

-/**

- * @generated

- */

-public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

-

-	/**

-	 * @generated

-	 */

-	public static final int VISUAL_ID = 6007;

-

-	/**

-	 * @generated

-	 */

-	private DirectEditManager manager;

-

-	/**

-	 * @generated

-	 */

-	private IParser parser;

-

-	/**

-	 * @generated

-	 */

-	private List<?> parserElements;

-

-	/**

-	 * @generated

-	 */

-	private String defaultText;

-

-	/**

-	 * direct edition mode (default, undefined, registered editor, etc.)

-	 *

-	 * @generated

-	 */

-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

-

-	/**

-	 * configuration from a registered edit dialog

-	 *

-	 * @generated

-	 */

-	protected IDirectEditorConfiguration configuration;

-	/**

-	 * @generated

-	 */

-	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 60));

-	}

-

-	/**

-	 * @generated

-	 */

-	public UsageNameEditPart(View view) {

-		super(view);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void createDefaultEditPolicies() {

-		super.createDefaultEditPolicies();

-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public int getKeyPoint() {

-		return ConnectionLocator.MIDDLE;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelTextHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getText();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getText();

-		} else {

-			return ((Label) figure).getText();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelTextHelper(IFigure figure, String text) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setText(text);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setText(text);

-		} else {

-			((Label) figure).setText(text);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIconHelper(IFigure figure) {

-		if (figure instanceof WrappingLabel) {

-			return ((WrappingLabel) figure).getIcon();

-		} else if (figure instanceof ILabelFigure) {

-			return ((ILabelFigure) figure).getIcon();

-		} else {

-			return ((Label) figure).getIcon();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setLabelIconHelper(IFigure figure, Image icon) {

-		if (figure instanceof WrappingLabel) {

-			((WrappingLabel) figure).setIcon(icon);

-		} else if (figure instanceof ILabelFigure) {

-			((ILabelFigure) figure).setIcon(icon);

-		} else {

-			((Label) figure).setIcon(icon);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setLabel(IFigure figure) {

-		unregisterVisuals();

-		setFigure(figure);

-		defaultText = getLabelTextHelper(figure);

-		registerVisuals();

-		refreshVisuals();

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected List<?> getModelChildren() {

-		return Collections.EMPTY_LIST;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void setParser(IParser parser) {

-		this.parser = parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected EObject getParserElement() {

-		return resolveSemanticElement();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected Image getLabelIcon() {

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected String getLabelText() {

-		String text = null;

-		EObject parserElement = getParserElement();

-		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

-		}

-		if (text == null || text.length() == 0) {

-			text = defaultText;

-		}

-		return text;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void setLabelText(String text) {

-		setLabelTextHelper(getFigure(), text);

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public String getEditText() {

-		if (getParserElement() == null || getParser() == null) {

-			return ""; //$NON-NLS-1$

-		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

-	}

-

-	/**

-	 * @generated

-	 */

-	protected boolean isEditable() {

-		return getParser() != null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ICellEditorValidator getEditTextValidator() {

-		return new ICellEditorValidator() {

-

-			@Override

-			public String isValid(final Object value) {

-				if (value instanceof String) {

-					final EObject element = getParserElement();

-					final IParser parser = getParser();

-					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

-						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

-					} catch (InterruptedException ie) {

-						ie.printStackTrace();

-					}

-				}

-				// shouldn't get here

-				return null;

-			}

-		};

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IContentAssistProcessor getCompletionProcessor() {

-		if (getParserElement() == null || getParser() == null) {

-			return null;

-		}

-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public ParserOptions getParserOptions() {

-		return ParserOptions.NONE;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public IParser getParser() {

-		if (parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID));

-		}

-		return parser;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected DirectEditManager getManager() {

-		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-		}

-		return manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void setManager(DirectEditManager manager) {

-		this.manager = manager;

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit() {

-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

-

-			@Override

-			public void run() {

-				getManager().show();

-			}

-		});

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void performDirectEdit(Point eventLocation) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	private void performDirectEdit(char initialCharacter) {

-		if (getManager() instanceof TextDirectEditManager) {

-			((TextDirectEditManager) getManager()).show(initialCharacter);

-		} else {

-			performDirectEdit();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void performDirectEditRequest(Request request) {

-		final Request theRequest = request;

-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

-			directEditionMode = getDirectEditionType();

-		}

-		switch (directEditionMode) {

-		case IDirectEdition.NO_DIRECT_EDITION:

-			// no direct edition mode => does nothing

-			return;

-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

-			updateExtendedEditorConfiguration();

-			if (configuration == null || configuration.getLanguage() == null) {

-				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

-				performDefaultDirectEditorEdit(theRequest);

-			} else {

-				configuration.preEditAction(resolveSemanticElement());

-				Dialog dialog = null;

-				if (configuration instanceof ICustomDirectEditorConfiguration) {

-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));

-					initializeDirectEditManager(theRequest);

-					return;

-				} else if (configuration instanceof IPopupEditorConfiguration) {

-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

-					helper.showEditor();

-					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

-				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

-				} else {

-					return;

-				}

-				final Dialog finalDialog = dialog;

-				if (Window.OK == dialog.open()) {

-					TransactionalEditingDomain domain = getEditingDomain();

-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

-

-						@Override

-						protected void doExecute() {

-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

-						}

-					};

-					domain.getCommandStack().execute(command);

-				}

-			}

-			break;

-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

-			initializeDirectEditManager(theRequest);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void initializeDirectEditManager(final Request request) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshVisuals() {

-		super.refreshVisuals();

-		refreshLabel();

-		refreshFont();

-		refreshFontColor();

-		refreshUnderline();

-		refreshStrikeThrough();

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshLabel() {

-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

-		if (maskLabelPolicy == null) {

-			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);

-		}

-		if (maskLabelPolicy == null) {

-			View view = (View) getModel();

-			if (view.isVisible()) {

-				setLabelTextHelper(getFigure(), getLabelText());

-				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

-				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

-				setLabelIconHelper(getFigure(), null);

-			}

-		}

-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();

-		}

-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

-		}

-		if (resolveSemanticElement() instanceof Feature) {

-			if (((Feature) resolveSemanticElement()).isStatic()) {

-				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

-				((WrappingLabel) getFigure()).setTextUnderline(false);

-			}

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null && getFigure() instanceof WrappingLabel) {

-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

-		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

-			setFont(fontData);

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void setFontColor(Color color) {

-		getFigure().setForegroundColor(color);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void addSemanticListeners() {

-		if (getParser() instanceof ISemanticParser) {

-			EObject element = resolveSemanticElement();

-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);

-			for (int i = 0; i < parserElements.size(); i++) {

-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$

-			}

-		} else {

-			super.addSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void removeSemanticListeners() {

-		if (parserElements != null) {

-			for (int i = 0; i < parserElements.size(); i++) {

-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

-			}

-		} else {

-			super.removeSemanticListeners();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected AccessibleEditPart getAccessibleEditPart() {

-		if (accessibleEP == null) {

-			accessibleEP = new AccessibleGraphicalEditPart() {

-

-				@Override

-				public void getName(AccessibleEvent e) {

-					e.result = getLabelTextHelper(getFigure());

-				}

-			};

-		}

-		return accessibleEP;

-	}

-

-	/**

-	 * @generated

-	 */

-	private View getFontStyleOwnerView() {

-		return getPrimaryView();

-	}

-

-	/**

-	 * Returns the kind of associated editor for direct edition.

-	 *

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

-	 * @generated

-	 */

-	public int getDirectEditionType() {

-		if (checkExtendedEditor()) {

-			initExtendedEditorConfiguration();

-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

-		}

-		if (checkDefaultEdition()) {

-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

-		}

-		// not a named element. no specific editor => do nothing

-		return IDirectEdition.NO_DIRECT_EDITION;

-	}

-

-	/**

-	 * Checks if an extended editor is present.

-	 *

-	 * @return <code>true</code> if an extended editor is present.

-	 * @generated

-	 */

-	protected boolean checkExtendedEditor() {

-		if (resolveSemanticElement() != null) {

-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

-		}

-		return false;

-	}

-

-	/**

-	 * Checks if a default direct edition is available

-	 *

-	 * @return <code>true</code> if a default direct edition is available

-	 * @generated

-	 */

-	protected boolean checkDefaultEdition() {

-		return (getParser() != null);

-	}

-

-	/**

-	 * Initializes the extended editor configuration

-	 *

-	 * @generated

-	 */

-	protected void initExtendedEditorConfiguration() {

-		if (configuration == null) {

-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-			if (languagePreferred != null && !languagePreferred.equals("")) {

-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-			} else {

-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

-			}

-		}

-	}

-

-	/**

-	 * Updates the preference configuration

-	 *

-	 * @generated

-	 */

-	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

-			configuration = null;

-		}

-	}

-

-	/**

-	 * Performs the direct edit usually used by GMF editors.

-	 *

-	 * @param theRequest

-	 *            the direct edit request that starts the direct edit system

-	 * @generated

-	 */

-	protected void performDefaultDirectEditorEdit(final Request theRequest) {

-		// initialize the direct edit manager

-		try {

-			getEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					if (isActive() && isEditable()) {

-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

-							performDirectEdit(initialChar.charValue());

-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

-							performDirectEdit(editRequest.getLocation());

-						} else {

-							performDirectEdit();

-						}

-					}

-				}

-			});

-		} catch (InterruptedException e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected void handleNotificationEvent(Notification event) {

-		Object feature = event.getFeature();

-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

-			Integer c = (Integer) event.getNewValue();

-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

-			refreshUnderline();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

-			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

-			refreshFont();

-		} else {

-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

-				refreshLabel();

-			}

-			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

-				if (modelParser.areSemanticElementsAffected(null, event)) {

-					removeSemanticListeners();

-					if (resolveSemanticElement() != null) {

-						addSemanticListeners();

-					}

-					refreshLabel();

-				}

-			}

-		}

-		super.handleNotificationEvent(event);

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	protected IFigure createFigure() {

-		// Parent should assign one using setLabel() method

-		return null;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.draw2d.ConnectionLocator;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.papyrus.extensionpoints.editors.Activator;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy;
+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.uml2.uml.Feature;
+
+/**
+ * @generated
+ */
+public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
+
+	/**
+	 * @generated
+	 */
+	public static final int VISUAL_ID = 6007;
+
+	/**
+	 * @generated
+	 */
+	private DirectEditManager manager;
+
+	/**
+	 * @generated
+	 */
+	private IParser parser;
+
+	/**
+	 * @generated
+	 */
+	private List<?> parserElements;
+
+	/**
+	 * @generated
+	 */
+	private String defaultText;
+
+	/**
+	 * direct edition mode (default, undefined, registered editor, etc.)
+	 *
+	 * @generated
+	 */
+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
+
+	/**
+	 * configuration from a registered edit dialog
+	 *
+	 * @generated
+	 */
+	protected IDirectEditorConfiguration configuration;
+	/**
+	 * @generated
+	 */
+	static {
+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 60));
+	}
+
+	/**
+	 * @generated
+	 */
+	public UsageNameEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusLinkLabelDragPolicy());
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public int getKeyPoint() {
+		return ConnectionLocator.MIDDLE;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelTextHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getText();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getText();
+		} else {
+			return ((Label) figure).getText();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelTextHelper(IFigure figure, String text) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setText(text);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setText(text);
+		} else {
+			((Label) figure).setText(text);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIconHelper(IFigure figure) {
+		if (figure instanceof WrappingLabel) {
+			return ((WrappingLabel) figure).getIcon();
+		} else if (figure instanceof ILabelFigure) {
+			return ((ILabelFigure) figure).getIcon();
+		} else {
+			return ((Label) figure).getIcon();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setLabelIconHelper(IFigure figure, Image icon) {
+		if (figure instanceof WrappingLabel) {
+			((WrappingLabel) figure).setIcon(icon);
+		} else if (figure instanceof ILabelFigure) {
+			((ILabelFigure) figure).setIcon(icon);
+		} else {
+			((Label) figure).setIcon(icon);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void setLabel(IFigure
+			figure) {
+		unregisterVisuals();
+		setFigure(figure);
+		defaultText = getLabelTextHelper(figure);
+		registerVisuals();
+		refreshVisuals();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected List<?> getModelChildren() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setParser(IParser parser) {
+		this.parser = parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected EObject getParserElement() {
+		return resolveSemanticElement();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Image getLabelIcon() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getLabelText() {
+		String text = null;
+		EObject parserElement = getParserElement();
+		if (parserElement != null && getParser() != null) {
+			text = getParser().getPrintString(
+					new EObjectAdapter(parserElement),
+					getParserOptions().intValue());
+		}
+		if (text == null || text.length() == 0) {
+			text = defaultText;
+		}
+		return text;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public void setLabelText(String text) {
+		setLabelTextHelper(getFigure(), text);
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public String getEditText() {
+		if (getParserElement() == null || getParser() == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getParser().getEditString(
+				new EObjectAdapter(getParserElement()),
+				getParserOptions().intValue());
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isEditable() {
+		return getParser() != null;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ICellEditorValidator getEditTextValidator() {
+		return new ICellEditorValidator() {
+
+			@Override
+			public String isValid(final Object value) {
+				if (value instanceof String) {
+					final EObject element = getParserElement();
+					final IParser parser = getParser();
+					try {
+						IParserEditStatus valid =
+								(IParserEditStatus) getEditingDomain().runExclusive(
+										new RunnableWithResult.Impl<java.lang.Object>() {
+
+											@Override
+											public void run() {
+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
+											}
+										});
+						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();
+					} catch (InterruptedException ie) {
+						ie.printStackTrace();
+					}
+				}
+
+				// shouldn't get here
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IContentAssistProcessor getCompletionProcessor() {
+		if (getParserElement() == null || getParser() == null) {
+			return null;
+		}
+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public ParserOptions getParserOptions() {
+		return ParserOptions.NONE;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public IParser getParser() {
+		if (parser == null) {
+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID));
+		}
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected DirectEditManager getManager() {
+		if (manager == null) {
+			setManager(new MultilineLabelDirectEditManager(this,
+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+					UMLEditPartFactory.getTextCellEditorLocator(this)));
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setManager(DirectEditManager manager) {
+		this.manager = manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
+
+			@Override
+			public void run() {
+				getManager().show();
+			}
+		});
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit(Point eventLocation) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private void performDirectEdit(char initialCharacter) {
+		if (getManager() instanceof TextDirectEditManager) {
+			((TextDirectEditManager) getManager()).show(initialCharacter);
+		} else {
+			performDirectEdit();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void performDirectEditRequest(Request request) {
+
+		final Request theRequest = request;
+
+		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
+			directEditionMode = getDirectEditionType();
+		}
+		switch (directEditionMode) {
+		case IDirectEdition.NO_DIRECT_EDITION:
+			// no direct edition mode => does nothing
+			return;
+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
+			updateExtendedEditorConfiguration();
+			if (configuration == null || configuration.getLanguage() == null) {
+				// Create default edit manager
+				setManager(new MultilineLabelDirectEditManager(this,
+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
+						UMLEditPartFactory.getTextCellEditorLocator(this)));
+				performDefaultDirectEditorEdit(theRequest);
+			} else {
+				configuration.preEditAction(resolveSemanticElement());
+				Dialog dialog = null;
+				if (configuration instanceof ICustomDirectEditorConfiguration) {
+					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
+					initializeDirectEditManager(theRequest);
+					return;
+				} else if (configuration instanceof IPopupEditorConfiguration) {
+					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
+					helper.showEditor();
+					return;
+				}
+				else if (configuration instanceof IAdvancedEditorConfiguration) {
+					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
+				} else if (configuration instanceof IDirectEditorConfiguration) {
+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),
+							configuration);
+				} else {
+					return;
+				}
+				final Dialog finalDialog = dialog;
+
+				if (Window.OK == dialog.open()) {
+					TransactionalEditingDomain domain = getEditingDomain();
+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
+
+						@Override
+						protected void doExecute() {
+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
+
+						}
+					};
+					domain.getCommandStack().execute(command);
+				}
+			}
+			break;
+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
+			initializeDirectEditManager(theRequest);
+			break;
+		default:
+			break;
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void initializeDirectEditManager(final Request request) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (request.getExtendedData().get(
+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						}
+						else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshVisuals() {
+		super.refreshVisuals();
+		refreshLabel();
+		refreshFont();
+		refreshFontColor();
+		refreshUnderline();
+		refreshStrikeThrough();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshLabel() {
+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
+		if (maskLabelPolicy == null) {
+			maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
+		}
+		if (maskLabelPolicy == null) {
+			View view = (View) getModel();
+			if (view.isVisible()) {
+				setLabelTextHelper(getFigure(), getLabelText());
+				setLabelIconHelper(getFigure(), getLabelIcon());
+			}
+			else {
+				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
+				setLabelIconHelper(getFigure(), null);
+			}
+		}
+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		}
+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
+		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
+			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshUnderline() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
+		}
+		if (resolveSemanticElement() instanceof Feature) {
+			if (((Feature) resolveSemanticElement()).isStatic()) {
+				((WrappingLabel) getFigure()).setTextUnderline(true);
+			}
+			else {
+				((WrappingLabel) getFigure()).setTextUnderline(false);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void refreshStrikeThrough() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null && getFigure() instanceof WrappingLabel) {
+			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void refreshFont() {
+		FontStyle style =
+				(FontStyle) getFontStyleOwnerView().getStyle(
+						NotationPackage.eINSTANCE.getFontStyle());
+		if (style != null) {
+			FontData fontData = new FontData(
+					style.getFontName(), style.getFontHeight(),
+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+			setFont(fontData);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void setFontColor(Color color) {
+		getFigure().setForegroundColor(color);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void addSemanticListeners() {
+		if (getParser() instanceof ISemanticParser) {
+			EObject element = resolveSemanticElement();
+			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
+			for (int i = 0; i < parserElements.size(); i++) {
+				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
+			}
+		} else {
+			super.addSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void removeSemanticListeners() {
+		if (parserElements != null) {
+			for (int i = 0; i < parserElements.size(); i++) {
+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
+			}
+		} else {
+			super.removeSemanticListeners();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected AccessibleEditPart getAccessibleEditPart() {
+		if (accessibleEP == null) {
+			accessibleEP = new AccessibleGraphicalEditPart() {
+
+				@Override
+				public void getName(AccessibleEvent e) {
+					e.result = getLabelTextHelper(getFigure());
+				}
+			};
+		}
+		return accessibleEP;
+	}
+
+	/**
+	 * @generated
+	 */
+	private View getFontStyleOwnerView() {
+		return getPrimaryView();
+	}
+
+	/**
+	 * Returns the kind of associated editor for direct edition.
+	 *
+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
+	 * @generated
+	 */
+	public int getDirectEditionType() {
+		if (checkExtendedEditor()) {
+			initExtendedEditorConfiguration();
+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
+		}
+		if (checkDefaultEdition()) {
+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
+		}
+
+		// not a named element. no specific editor => do nothing
+		return IDirectEdition.NO_DIRECT_EDITION;
+	}
+
+	/**
+	 * Checks if an extended editor is present.
+	 *
+	 * @return <code>true</code> if an extended editor is present.
+	 * @generated
+	 */
+	protected boolean checkExtendedEditor() {
+		if (resolveSemanticElement() != null) {
+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if a default direct edition is available
+	 *
+	 * @return <code>true</code> if a default direct edition is available
+	 * @generated
+	 */
+	protected boolean checkDefaultEdition() {
+		return (getParser() != null);
+	}
+
+	/**
+	 * Initializes the extended editor configuration
+	 *
+	 * @generated
+	 */
+	protected void initExtendedEditorConfiguration() {
+		if (configuration == null) {
+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+			if (languagePreferred != null && !languagePreferred.equals("")) {
+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
+			} else {
+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
+			}
+		}
+	}
+
+	/**
+	 * Updates the preference configuration
+	 *
+	 * @generated
+	 */
+	protected void updateExtendedEditorConfiguration() {
+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
+		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
+					.eClass().getInstanceClassName());
+		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
+			configuration = null;
+		}
+	}
+
+	/**
+	 * Performs the direct edit usually used by GMF editors.
+	 *
+	 * @param theRequest
+	 *            the direct edit request that starts the direct edit system
+	 * @generated
+	 */
+	protected void performDefaultDirectEditorEdit(final Request theRequest) {
+		// initialize the direct edit manager
+		try {
+			getEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					if (isActive() && isEditable()) {
+						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
+							Character initialChar = (Character) theRequest.getExtendedData().get(
+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
+							performDirectEdit(initialChar.charValue());
+						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
+							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
+							performDirectEdit(editRequest.getLocation());
+						} else {
+							performDirectEdit();
+						}
+					}
+				}
+			});
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void handleNotificationEvent(Notification event) {
+		Object feature = event.getFeature();
+		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
+			Integer c = (Integer) event.getNewValue();
+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
+		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
+			refreshUnderline();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
+			refreshStrikeThrough();
+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+			refreshFont();
+		} else {
+			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
+				refreshLabel();
+			}
+			if (getParser() instanceof ISemanticParser) {
+				ISemanticParser modelParser =
+						(ISemanticParser) getParser();
+				if (modelParser.areSemanticElementsAffected(null, event)) {
+					removeSemanticListeners();
+					if (resolveSemanticElement() != null) {
+						addSemanticListeners();
+					}
+					refreshLabel();
+				}
+			}
+		}
+
+		super.handleNotificationEvent(event);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected IFigure createFigure() {
+		// Parent should assign one using setLabel() method
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
index f3d293a2104..3c1ac4121c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -133,6 +133,8 @@ public class UseCaseEditPart extends NodeEditPart {
 			((UseCaseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class UseCaseEditPart extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
index 609ce2cb3e1..a34ea6f8c48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -133,6 +133,8 @@ public class UseCaseEditPartCN extends NodeEditPart {
 			((UseCaseNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());

 			return true;

 		}

+

+

 		return false;

 	}

 

@@ -196,6 +198,7 @@ public class UseCaseEditPartCN extends NodeEditPart {
 	@Override

 	protected NodeFigure createNodeFigure() {

 		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
index 9738be4b8c4..dbe7e8d5d73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
@@ -199,7 +199,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements I
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
index 90e47355bd5..3f18049403e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
@@ -199,7 +199,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * @generated

 	 */

-	public void setLabel(IFigure figure) {

+	public void setLabel(IFigure

+			figure) {

 		unregisterVisuals();

 		setFigure(figure);

 		defaultText = getLabelTextHelper(figure);

@@ -262,7 +263,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		String text = null;

 		EObject parserElement = getParserElement();

 		if (parserElement != null && getParser() != null) {

-			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+			text = getParser().getPrintString(

+					new EObjectAdapter(parserElement),

+					getParserOptions().intValue());

 		}

 		if (text == null || text.length() == 0) {

 			text = defaultText;

@@ -294,7 +297,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		if (getParserElement() == null || getParser() == null) {

 			return ""; //$NON-NLS-1$

 		}

-		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+		return getParser().getEditString(

+				new EObjectAdapter(getParserElement()),

+				getParserOptions().intValue());

 	}

 

 	/**

@@ -317,18 +322,21 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 					final EObject element = getParserElement();

 					final IParser parser = getParser();

 					try {

-						IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

-

-							@Override

-							public void run() {

-								setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

-							}

-						});

+						IParserEditStatus valid =

+								(IParserEditStatus) getEditingDomain().runExclusive(

+										new RunnableWithResult.Impl<java.lang.Object>() {

+

+											@Override

+											public void run() {

+												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));

+											}

+										});

 						return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage();

 					} catch (InterruptedException ie) {

 						ie.printStackTrace();

 					}

 				}

+

 				// shouldn't get here

 				return null;

 			}

@@ -370,7 +378,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected DirectEditManager getManager() {

 		if (manager == null) {

-			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+			setManager(new MultilineLabelDirectEditManager(this,

+					MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+					UMLEditPartFactory.getTextCellEditorLocator(this)));

 		}

 		return manager;

 	}

@@ -420,7 +430,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void performDirectEditRequest(Request request) {

+

 		final Request theRequest = request;

+

 		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

 			directEditionMode = getDirectEditionType();

 		}

@@ -432,7 +444,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 			updateExtendedEditorConfiguration();

 			if (configuration == null || configuration.getLanguage() == null) {

 				// Create default edit manager

-				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				setManager(new MultilineLabelDirectEditManager(this,

+						MultilineLabelDirectEditManager.getTextCellEditorClass(this),

+						UMLEditPartFactory.getTextCellEditorLocator(this)));

 				performDefaultDirectEditorEdit(theRequest);

 			} else {

 				configuration.preEditAction(resolveSemanticElement());

@@ -445,14 +459,17 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);

 					helper.showEditor();

 					return;

-				} else if (configuration instanceof IAdvancedEditorConfiguration) {

+				}

+				else if (configuration instanceof IAdvancedEditorConfiguration) {

 					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

 				} else if (configuration instanceof IDirectEditorConfiguration) {

-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration);

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()),

+							configuration);

 				} else {

 					return;

 				}

 				final Dialog finalDialog = dialog;

+

 				if (Window.OK == dialog.open()) {

 					TransactionalEditingDomain domain = getEditingDomain();

 					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

@@ -460,6 +477,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 						@Override

 						protected void doExecute() {

 							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());

+

 						}

 					};

 					domain.getCommandStack().execute(command);

@@ -481,14 +499,15 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		// initialize the direct edit manager

 		try {

 			getEditingDomain().runExclusive(new Runnable() {

-

 				@Override

 				public void run() {

 					if (isActive() && isEditable()) {

-						if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+						if (request.getExtendedData().get(

+								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

 							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

-						} else {

+						}

+						else {

 							performDirectEdit();

 						}

 					}

@@ -525,7 +544,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 			if (view.isVisible()) {

 				setLabelTextHelper(getFigure(), getLabelText());

 				setLabelIconHelper(getFigure(), getLabelIcon());

-			} else {

+			}

+			else {

 				setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$

 				setLabelIconHelper(getFigure(), null);

 			}

@@ -544,14 +564,17 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshUnderline() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());

 		}

 		if (resolveSemanticElement() instanceof Feature) {

 			if (((Feature) resolveSemanticElement()).isStatic()) {

 				((WrappingLabel) getFigure()).setTextUnderline(true);

-			} else {

+			}

+			else {

 				((WrappingLabel) getFigure()).setTextUnderline(false);

 			}

 		}

@@ -561,7 +584,9 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void refreshStrikeThrough() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null && getFigure() instanceof WrappingLabel) {

 			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());

 		}

@@ -572,9 +597,14 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	@Override

 	protected void refreshFont() {

-		FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		FontStyle style =

+				(FontStyle) getFontStyleOwnerView().getStyle(

+						NotationPackage.eINSTANCE.getFontStyle());

 		if (style != null) {

-			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			FontData fontData = new FontData(

+					style.getFontName(), style.getFontHeight(),

+					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |

+							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

 			setFont(fontData);

 		}

 	}

@@ -655,6 +685,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 		if (checkDefaultEdition()) {

 			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

 		}

+

 		// not a named element. no specific editor => do nothing

 		return IDirectEdition.NO_DIRECT_EDITION;

 	}

@@ -704,9 +735,11 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void updateExtendedEditorConfiguration() {

-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(

+				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

 		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()

+					.eClass().getInstanceClassName());

 		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

 			configuration = null;

 		}

@@ -728,7 +761,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 				public void run() {

 					if (isActive() && isEditable()) {

 						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							Character initialChar = (Character) theRequest.getExtendedData().get(

+									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

 							performDirectEdit(initialChar.charValue());

 						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

 							DirectEditRequest editRequest = (DirectEditRequest) theRequest;

@@ -776,15 +810,18 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 			refreshUnderline();

 		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

 			refreshStrikeThrough();

-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)

-				|| NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||

+				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

 			refreshFont();

 		} else {

 			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

 				refreshLabel();

 			}

 			if (getParser() instanceof ISemanticParser) {

-				ISemanticParser modelParser = (ISemanticParser) getParser();

+				ISemanticParser modelParser =

+						(ISemanticParser) getParser();

 				if (modelParser.areSemanticElementsAffected(null, event)) {

 					removeSemanticListeners();

 					if (resolveSemanticElement() != null) {

@@ -827,7 +864,8 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 * @generated

 	 */

 	protected void addOwnerElementListeners() {

-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel()));

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); 

+

 	}

 

 	/**

@@ -837,6 +875,7 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	public void deactivate() {

 		removeOwnerElementListeners();

 		super.deactivate();

+

 	}

 

 	/**

@@ -844,5 +883,6 @@ public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements
 	 */

 	protected void removeOwnerElementListeners() {

 		removeListenerFilter(ADD_PARENT_MODEL);

+

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
index 2d7b02a9af3..a1f74af09f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
index ba8ba4e002a..218f280da00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class ActivityCompositeCompartmentItemSemanticEditPolicy extends UMLBaseI
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
index e6fe29b2751..6cc93ec7fb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class ActivityCompositeCompartmentItemSemanticEditPolicyCN extends UMLBas
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
index 671ee0a7f86..4d5098a756d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
index 0ca7a46be70..a0cb21891db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
index 7f5d327119d..6e044f7ad3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
index 4925ccfd43a..e81703b8e8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
index d48245ff71c..ba875c684ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
index 9694bcf5e99..9eb014f2e9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
index dfa195fc785..a8fd0cf6f1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
index c04dd6667eb..8d5e691b375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
index fd7f57b67bd..2f6d53d4498 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
index f2bf11f0cfe..6daa66b1def 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
@@ -68,95 +68,157 @@ public class ClassCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
index 0209bab15d8..c9234b8af0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -68,95 +68,157 @@ public class ClassCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseIt
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
index 132a9f2cf71..4b411a7a4e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
index 569d74ace7f..8e506f2773b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
@@ -91,8 +91,12 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
index 1dcc5c880b9..f091717dab0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
@@ -47,32 +47,52 @@ public class CollaborationCompositeCompartmentItemSemanticEditPolicy extends UML
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
index bae0523a892..c6b5b8b7571 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -47,32 +47,52 @@ public class CollaborationCompositeCompartmentItemSemanticEditPolicyCN extends U
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
index ba2e6cc52ae..4a8ac134619 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
index b9ea50da276..e095be4fa87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemS
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
index 95373063988..2db055fc00b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
index 86e522b9faf..58e492b50af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
index bfc7b5d58c6..ba20cb62b1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
@@ -54,6 +54,7 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -66,7 +67,8 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -94,7 +96,8 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			return null;

@@ -126,13 +129,15 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
index 2f62353f8a8..d80aaefa536 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -54,6 +54,7 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -66,7 +67,8 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -94,7 +96,8 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			return null;

@@ -126,13 +129,15 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
index 56a72c7d3dc..ce198b970eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
@@ -68,95 +68,157 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBase
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
index 98bc34d7c33..f93ae36737d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -68,95 +68,157 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBa
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
index a0f45940309..fadbcc84156 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
index b91ebc1fa5b..4751d50244b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
@@ -91,8 +91,12 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
index 8f3d53d8528..961a0cca385 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
index 1f897d8a752..0f67056d5c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
@@ -91,152 +91,252 @@ public class CompositeStructureDiagramItemSemanticEditPolicy extends UMLBaseItem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Activity_2060 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_2061 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_2062 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_2063 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_2064 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_2065 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_2069 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_2070 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_2071 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_2072 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_2073 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_2075 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_2076 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_2066 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_2067 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_2068 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_2077 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_2078 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_2079 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_2080 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_2081 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_2082 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.SignalEvent_2083 == requestElementType) {

+

 			return getGEFWrapper(new SignalEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CallEvent_2084 == requestElementType) {

+

 			return getGEFWrapper(new CallEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.AnyReceiveEvent_2085 == requestElementType) {

+

 			return getGEFWrapper(new AnyReceiveEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ChangeEvent_2088 == requestElementType) {

+

 			return getGEFWrapper(new ChangeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeEvent_2089 == requestElementType) {

+

 			return getGEFWrapper(new TimeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationObservation_2093 == requestElementType) {

+

 			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeObservation_2094 == requestElementType) {

+

 			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.LiteralBoolean_2095 == requestElementType) {

+

 			return getGEFWrapper(new LiteralBooleanCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.LiteralInteger_2096 == requestElementType) {

+

 			return getGEFWrapper(new LiteralIntegerCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.LiteralNull_2097 == requestElementType) {

+

 			return getGEFWrapper(new LiteralNullCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.LiteralString_2098 == requestElementType) {

+

 			return getGEFWrapper(new LiteralStringCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.LiteralUnlimitedNatural_2099 == requestElementType) {

+

 			return getGEFWrapper(new LiteralUnlimitedNaturalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StringExpression_2100 == requestElementType) {

+

 			return getGEFWrapper(new StringExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueExpression_2101 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeExpression_2102 == requestElementType) {

+

 			return getGEFWrapper(new TimeExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Expression_2103 == requestElementType) {

+

 			return getGEFWrapper(new ExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Duration_2104 == requestElementType) {

+

 			return getGEFWrapper(new DurationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeInterval_2105 == requestElementType) {

+

 			return getGEFWrapper(new TimeIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationInterval_2106 == requestElementType) {

+

 			return getGEFWrapper(new DurationIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interval_2107 == requestElementType) {

+

 			return getGEFWrapper(new IntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InstanceValue_2108 == requestElementType) {

+

 			return getGEFWrapper(new InstanceValueCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_2109 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_2110 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_2111 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_2112 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_2113 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_2114 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
index 0c5075e9383..45b68a103e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
index 904d3047025..793df389d5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index b8640d83bab..cfcfc1ac3d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
index 65b7c0911e9..1d704ce680c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
@@ -39,8 +39,12 @@ public class DataTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseI
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3101 == requestElementType) {

+

 			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
index c4a706d2f3d..aea56fc5104 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -39,8 +39,12 @@ public class DataTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBas
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3101 == requestElementType) {

+

 			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
index 81808ff4f87..b9fe4f91522 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index ff31f2d448a..0cde33c1983 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
index ce91e6546a1..38ea3576bdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
@@ -39,8 +39,12 @@ public class DataTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseI
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Operation_3102 == requestElementType) {

+

 			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
index c6a375bf184..8ccd736ef10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
@@ -39,8 +39,12 @@ public class DataTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBas
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Operation_3102 == requestElementType) {

+

 			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
index 2fefb4cf10d..9efd0af4fec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
index b75da255396..ea209bc542e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
index 6fb7a0871b4..cd9134150ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
index a51e2b7fc97..e9469c2cdc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
index 7e1ad831b76..3bbd14149d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
@@ -68,95 +68,157 @@ public class DeviceCompositeCompartmentItemSemanticEditPolicy extends UMLBaseIte
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
index 088e4202bac..73ae475f316 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -68,95 +68,157 @@ public class DeviceCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseI
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
index a34a9befd24..977e07d2b06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
index 4300feb4c7d..d989a12344d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
@@ -91,8 +91,12 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index db030a48254..55b81015e6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
index 3e780335a5d..65fd781dcd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
index 337aeb1730e..7e458550ca7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
index 897b545de0a..c7e859a1481 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 60a77ed4201..50f68c6bae5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -193,13 +205,15 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
index 2ad199e10d8..3af384bc751 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
@@ -39,8 +39,12 @@ public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy exte
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
index 9ad8861dbc1..87d8a386dac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
@@ -39,8 +39,12 @@ public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN ex
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
index 1a0e139c88c..c15406dd1bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index f15c7a094fa..eda016478c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -91,8 +91,12 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
index 7a2b801a0a1..ebe174b6408 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
@@ -51,7 +51,7 @@ public class EnumerationLiteralItemSemanticEditPolicyCLN extends UMLBaseItemSema
 			// delete host element

 			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

 			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
index 6ac136225a6..ef0f4110341 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
@@ -68,95 +68,157 @@ public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy exte
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
index 122117446ce..f5200c78f37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -68,95 +68,157 @@ public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN ex
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
index 4170ee5ed90..7c6e50c4532 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
index 4ec8c27675a..70239dad3a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
@@ -91,8 +91,12 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
index 5900dc1a5c1..b620dcf4491 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
index fc169bd94ed..73774debdd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy extends
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
index c6c1db72a4b..5b2f9836770 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN extend
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
index e988d880e7e..260484ded63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
index af3fa9cf673..37cc1b073b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseIt
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
index 948e2ad75cc..fab26252502 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -54,6 +54,7 @@ public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -66,7 +67,8 @@ public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -120,13 +122,15 @@ public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
index 32eaaa45b7b..d00a68e831b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
index 492f2bc5bb9..10743d3b28a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -207,13 +220,15 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -242,103 +257,120 @@ public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
index f2a185803e5..97df54b31e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -207,13 +220,15 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -242,103 +257,120 @@ public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
index 3dc3bf2b0f5..37c31d8df79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
index 4027877846e..748f7d1a151 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class InteractionCompositeCompartmentItemSemanticEditPolicy extends UMLBa
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
index e1ae3cd8e1b..0f0505efd2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class InteractionCompositeCompartmentItemSemanticEditPolicyCN extends UML
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
index e63fc3237ab..26414aaf9a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
index c5a04cafad5..5389a9a1605 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSem
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
index 45d6a1f5e1a..7c99bf0c802 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
index 219cf11f879..8969fd16b3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
index 179eb77c621..6043fa19114 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
index 3e681c2d4ed..4029f5395f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
index c8819b840ce..43c2fddb729 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
index b730f74c0db..e31565888b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
index 2b20295f801..4b9c3cfe36e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
index 004aa922bb5..8ec14765e31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
index 8f4423bd1b2..ee59f3ad558 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
index 7684fa2a24d..7f02e426923 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
index 7adf1a5f908..593f59ff2c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
index 6a8393d9920..1c569ce22a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
index 24f4c949501..6e8e1a529da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
index 3641533de79..16e7d51a3df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
index eeca575f3b8..3247d4e1153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
@@ -68,95 +68,157 @@ public class NodeCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemS
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
index 38f9310ddf8..9a8e0d8f04b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -68,95 +68,157 @@ public class NodeCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseIte
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
index 945dc2677ce..bb90d998e45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
@@ -91,8 +91,12 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
index d12e1b164e2..f7e27436bb5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
@@ -91,8 +91,12 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -107,6 +111,7 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -119,7 +124,8 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -153,67 +159,78 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -228,7 +245,8 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -257,103 +275,120 @@ public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
index 954dc6aca37..6c51310b916 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy extends UM
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
index 3abe0ccd77f..86fcd354594 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
index e6e0c896885..65b8b68028e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
index e21995fe69c..fc1d5659a87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItem
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
index e2fb0ec270b..7b0027ce18a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
index f05252f1043..23a56c088fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
@@ -51,7 +51,7 @@ public class OperationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditP
 			// delete host element

 			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

 			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
index 46f00bb280d..9a4112d8b11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
index a6896d81af8..d4d5161a1c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index 313947dfa6f..beb518757fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index e12d81d8930..ad7d05d3a8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
index 89b162f6c56..0ad14b9b467 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
@@ -51,7 +51,7 @@ public class PropertyItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPo
 			// delete host element

 			List<EObject> todestroy = new ArrayList<EObject>();

 			todestroy.add(req.getElementToDestroy());

-			// cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

 			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

 		} else {

 			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
index 7660361d529..86ad6230b36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
@@ -40,11 +40,17 @@ public class PropertyPartCompartmentItemSemanticEditPolicyCN extends UMLBaseItem
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
index 9abaf930289..5044390e349 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
@@ -86,8 +86,12 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -102,6 +106,7 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -114,7 +119,8 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -148,61 +154,71 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -214,7 +230,8 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -243,91 +260,106 @@ public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
index b76b782271f..7835b637243 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy exte
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
index f95e002a6c8..527b7287dcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN ex
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
index 20edf6ae1d6..88bab4a96d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBase
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
index 319267e4c9e..fdb13982547 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBa
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
index 799493d011b..aab5a4c2340 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
index 1722527ae7c..f84f0066bae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
index f391670348f..7638409250a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
index ec74b81e310..4e51e8b4f51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
index f60285888be..d7c6aeb8a64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolic
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
index 56af19630d4..27690e5e2de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
@@ -69,98 +69,162 @@ public class StateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLB
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
index 7562041b8ce..5b2ff68d774 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -69,98 +69,162 @@ public class StateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UM
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Property_3070 == requestElementType) {

+

 			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Activity_3072 == requestElementType) {

+

 			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interaction_3073 == requestElementType) {

+

 			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

 			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.StateMachine_3075 == requestElementType) {

+

 			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

 			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

 			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Component_3081 == requestElementType) {

+

 			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Device_3082 == requestElementType) {

+

 			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

 			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Node_3084 == requestElementType) {

+

 			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Class_3085 == requestElementType) {

+

 			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Collaboration_3086 == requestElementType) {

+

 			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Interface_3087 == requestElementType) {

+

 			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

 			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Enumeration_3079 == requestElementType) {

+

 			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DataType_3080 == requestElementType) {

+

 			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Actor_3091 == requestElementType) {

+

 			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

 			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Artifact_3093 == requestElementType) {

+

 			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InformationItem_3094 == requestElementType) {

+

 			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Signal_3095 == requestElementType) {

+

 			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.UseCase_3096 == requestElementType) {

+

 			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Comment_3097 == requestElementType) {

+

 			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

 			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

 			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

 			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

 			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Constraint_3120 == requestElementType) {

+

 			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
index b1e72827a07..0dca1a06f28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
@@ -92,11 +92,17 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSema
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
index 27a0233c3de..495f207f222 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
@@ -92,11 +92,17 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 		if (requestElementType == null) {

 			return super.getCreateCommand(req);

 		}

+

+

 		if (UMLElementTypes.Port_3069 == requestElementType) {

+

 			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		if (UMLElementTypes.Parameter_3088 == requestElementType) {

+

 			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

 		}

 		return super.getCreateCommand(req);

 	}

@@ -111,6 +117,7 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -123,7 +130,8 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -157,67 +165,78 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -232,7 +251,8 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -261,103 +281,120 @@ public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSe
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
index 3f7f6a02a62..94c0f876d2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
index 32396524288..053440fb3ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index ba4478906b7..42147d5d4fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
index f9d4a35380e..e210897333d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
@@ -84,6 +84,7 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -127,67 +129,78 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticE
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
index 2cb1a8a4aba..9271b399fad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
index 5ffaebaf079..d83390ac73c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
index c13de18c04b..fcddee54f24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
index 8637a3be4e9..66ab541585f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,67 +132,78 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			return null;

@@ -199,7 +212,8 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -228,91 +242,106 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index eef6f1f69ca..91057508a71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -366,6 +366,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		} else {

 			return getGEFWrapper(new MoveElementsCommand(req));

 		}

+

 	}

 

 	/**

@@ -455,11 +456,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateCommentAnnotatedElement_4002(Comment source, Element target) {

 			if (source != null) {

-				if (source.getAnnotatedElements().contains(target)) {

+				if (source.getAnnotatedElements()

+						.contains(target)) {

 					return false;

 				}

 			}

-			return canExistCommentAnnotatedElement_4002(source, target);

+

+			return canExistCommentAnnotatedElement_4002(

+					source, target);

 		}

 

 		/**

@@ -467,95 +471,110 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateConstraintConstrainedElement_4003(Constraint source, Element target) {

 			if (source != null) {

-				if (source.getConstrainedElements().contains(target)) {

+				if (source.getConstrainedElements()

+						.contains(target)) {

 					return false;

 				}

 			}

-			return canExistConstraintConstrainedElement_4003(source, target);

+

+			return canExistConstraintConstrainedElement_4003(

+					source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateComponentRealization_4004(Package container, NamedElement source, NamedElement target) {

-			return canExistComponentRealization_4004(container, null, source, target);

+			return canExistComponentRealization_4004(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateInterfaceRealization_4005(Package container, NamedElement source, NamedElement target) {

-			return canExistInterfaceRealization_4005(container, null, source, target);

+			return canExistInterfaceRealization_4005(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateSubstitution_4011(Package container, NamedElement source, NamedElement target) {

-			return canExistSubstitution_4011(container, null, source, target);

+			return canExistSubstitution_4011(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateRealization_4006(Package container, NamedElement source, NamedElement target) {

-			return canExistRealization_4006(container, null, source, target);

+			return canExistRealization_4006(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateManifestation_4012(Package container, NamedElement source, NamedElement target) {

-			return canExistManifestation_4012(container, null, source, target);

+			return canExistManifestation_4012(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateAbstraction_4007(Package container, NamedElement source, NamedElement target) {

-			return canExistAbstraction_4007(container, null, source, target);

+			return canExistAbstraction_4007(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateUsage_4008(Package container, NamedElement source, NamedElement target) {

-			return canExistUsage_4008(container, null, source, target);

+			return canExistUsage_4008(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDeployment_4009(Package container, NamedElement source, NamedElement target) {

-			return canExistDeployment_4009(container, null, source, target);

+			return canExistDeployment_4009(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_4017(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_4017(container, null, source, target);

+			return canExistDependency_4017(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateDependency_4010(Package container, NamedElement source, NamedElement target) {

-			return canExistDependency_4010(container, null, source, target);

+			return canExistDependency_4010(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateConnector_4013(StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {

-			return canExistConnector_4013(container, null, source, target);

+			return canExistConnector_4013(

+					container, null, source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateGeneralization_4015(Classifier container, Classifier source, Classifier target) {

-			return canExistGeneralization_4015(container, null, source, target);

+			return canExistGeneralization_4015(

+					container, null, source, target);

 		}

 

 		/**

@@ -563,11 +582,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateTimeObservationEvent_4018(TimeObservation source, NamedElement target) {

 			if (source != null) {

-				if (source.getEvent() != null) {

+				if (source.getEvent()

+					!= null) {

 					return false;

 				}

 			}

-			return canExistTimeObservationEvent_4018(source, target);

+

+			return canExistTimeObservationEvent_4018(

+					source, target);

 		}

 

 		/**

@@ -575,11 +597,17 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateDurationObservationEvent_4019(DurationObservation source, NamedElement target) {

 			if (source != null) {

-				if (source.getEvents().size() >= 2 || source.getEvents().contains(target)) {

+				if (source.getEvents()

+						.size() >= 2

+						||

+						source.getEvents()

+								.contains(target)) {

 					return false;

 				}

 			}

-			return canExistDurationObservationEvent_4019(source, target);

+

+			return canExistDurationObservationEvent_4019(

+					source, target);

 		}

 

 		/**

@@ -587,18 +615,22 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canCreateInformationItemRepresented_4020(InformationItem source, Classifier target) {

 			if (source != null) {

-				if (source.getRepresenteds().contains(target)) {

+				if (source.getRepresenteds()

+						.contains(target)) {

 					return false;

 				}

 			}

-			return canExistInformationItemRepresented_4020(source, target);

+

+			return canExistInformationItemRepresented_4020(

+					source, target);

 		}

 

 		/**

 		 * @generated

 		 */

 		public boolean canCreateInformationFlow_4021(Package container, NamedElement source, NamedElement target) {

-			return canExistInformationFlow_4021(container, null, source, target);

+			return canExistInformationFlow_4021(

+					container, null, source, target);

 		}

 

 		/**

@@ -755,7 +787,10 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 			try {

 				// Represented InformationItem Target

 				if (target != null) {

-					if (!((target instanceof Class) || (target instanceof Interface) || (target instanceof InformationItem) || (target instanceof Signal) || (target instanceof Component))) {

+					if (!((target instanceof Class)

+							|| (target instanceof Interface)

+							|| (target instanceof InformationItem)

+							|| (target instanceof Signal) || (target instanceof Component))) {

 						return false;

 					}

 				}

@@ -771,11 +806,23 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		 */

 		public boolean canExistInformationFlow_4021(Package container, InformationFlow linkInstance, NamedElement source, NamedElement target) {

 			try {

-				// Information Flow source constraint

+				//Information Flow source constraint

 				if (source != null) {

-					if (!((source instanceof Actor) || (source instanceof Node) || (source instanceof UseCase) || (source instanceof Artifact) || (source instanceof Class) || (source instanceof Component) || (source instanceof Port)

-							|| (source instanceof Property) || (source instanceof Interface) || (source instanceof Package) || (source instanceof ActivityNode) || (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

+					if (!((source instanceof Actor)

+							|| (source instanceof Node)

+							|| (source instanceof UseCase)

+							|| (source instanceof Artifact)

+							|| (source instanceof Class)

+							|| (source instanceof Component)

+							|| (source instanceof Port)

+							|| (source instanceof Property)

+							|| (source instanceof Interface)

+							|| (source instanceof Package)

+							|| (source instanceof ActivityNode)

+							|| (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

+

 						return false;

+

 					}

 					if (source instanceof InstanceSpecification) {

 						EList<Classifier> classes = ((InstanceSpecification) source).getClassifiers();

@@ -786,11 +833,23 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 						}

 					}

 				}

-				// Information Flow target constraint

+				//Information Flow target constraint

 				if (target != null) {

-					if (!((target instanceof Actor) || (target instanceof Node) || (target instanceof UseCase) || (target instanceof Artifact) || (target instanceof Class) || (target instanceof Component) || (target instanceof Port)

-							|| (target instanceof Property) || (target instanceof Interface) || (target instanceof Package) || (target instanceof ActivityNode) || (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

+					if (!((target instanceof Actor)

+							|| (target instanceof Node)

+							|| (target instanceof UseCase)

+							|| (target instanceof Artifact)

+							|| (target instanceof Class)

+							|| (target instanceof Component)

+							|| (target instanceof Port)

+							|| (target instanceof Property)

+							|| (target instanceof Interface)

+							|| (target instanceof Package)

+							|| (target instanceof ActivityNode)

+							|| (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

+

 						return false;

+

 					}

 					if (target instanceof InstanceSpecification) {

 						EList<Classifier> classes = ((InstanceSpecification) target).getClassifiers();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
index 0043283a0e6..630d22f7675 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -221,7 +221,6 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	private FigureListener getHostPositionListener() {

 		if (hostPositionListener == null) {

 			hostPositionListener = new FigureListener() {

-

 				@Override

 				public void figureMoved(IFigure source) {

 					refreshFeedback();

@@ -236,7 +235,8 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl
 	 */

 	@Override

 	protected List<?> createSelectionHandles() {

-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());

+		MoveHandle moveHandle =

+				new MoveHandle((GraphicalEditPart) getHost());

 		moveHandle.setBorder(null);

 		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));

 		return Collections.singletonList(moveHandle);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
index 62ac2f369f8..dbe91ab6ed5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
@@ -215,7 +215,6 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I
 	private FigureListener getHostPositionListener() {

 		if (hostPositionListener == null) {

 			hostPositionListener = new FigureListener() {

-

 				@Override

 				public void figureMoved(IFigure source) {

 					refreshFeedback();

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
index f626b6c4c22..34bb3b98e9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
@@ -84,6 +84,7 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -96,7 +97,8 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -130,61 +132,71 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -196,7 +208,8 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -225,91 +238,106 @@ public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
index 825afdcab6f..9d4c993ce91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
@@ -89,6 +89,7 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
index 71702404dfa..b62d9023cdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
@@ -89,6 +89,7 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 		if (provider != null) {

 			// Retrieve delete command from the Element Edit service

 			ICommand deleteCommand = provider.getEditCommand(req);

+

 			if (deleteCommand != null) {

 				return new ICommandProxy(deleteCommand);

 			}

@@ -101,7 +102,8 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ?

+				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -135,67 +137,78 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			return null;

@@ -210,7 +223,8 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

@@ -239,103 +253,120 @@ public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_4011 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new SubstitutionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Realization_4006 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RealizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_4012 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new ManifestationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_4007 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new AbstractionCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Usage_4008 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new UsageCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Deployment_4009 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DeploymentCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4017 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RoleBindingCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_4010 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DependencyCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Generalization_4015 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new GeneralizationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new RepresentationCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {

 			if (isExtendedType) {

 				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

 			}

-			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+			return getGEFWrapper(new InformationFlowCreateCommand(req,

+					req.getSource(), req.getTarget()));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
index 0b0b43a3b47..f0bcc52246c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
@@ -182,7 +182,12 @@ public class MessageFormatParser extends AbstractAttributeParser {
 		ParsePosition pos = new ParsePosition(0);

 		Object[] values = getEditProcessor().parse(editString, pos);

 		if (values == null) {

-			return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));

+			return new ParserEditStatus(

+					UMLDiagramEditorPlugin.ID,

+					IParserEditStatus.UNEDITABLE,

+					NLS.bind(

+							Messages.MessageFormatParser_InvalidInputError,

+							new Integer(pos.getErrorIndex())));

 		}

 		return validateNewValues(values);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
index 8236f954406..612f2ab8b67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
@@ -45,11 +45,13 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
 	public void buildContextMenu(final IMenuManager menu) {

 		getViewer().flush();

 		try {

-			TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {

+			TransactionUtil.getEditingDomain(

+					(EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {

 

 				@Override

 				public void run() {

-					ContributionItemService.getInstance().contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);

+					ContributionItemService.getInstance().contributeToPopupMenu(

+							DiagramEditorContextMenuProvider.this, part);

 					menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

 				}

 			});

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
index d5474a1d8ff..ba503192262 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
@@ -116,6 +116,7 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

 		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

 		addPage(diagramModelFilePage);

+

 		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$

 

 			@Override

@@ -123,7 +124,8 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 				if (visible) {

 					String fileName = diagramModelFilePage.getFileName();

 					fileName = fileName.substring(0, fileName.length() - ".uml_csd".length()); //$NON-NLS-1$

-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

+					setFileName(UMLDiagramEditorUtil.getUniqueFileName(

+							getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

 				}

 				super.setVisible(visible);

 			}

@@ -138,27 +140,34 @@ public class UMLCreationWizard extends Wizard implements INewWizard {
 	 */

 	@Override

 	public boolean performFinish() {

-		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

-

-			@Override

-			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {

-				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor);

-				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

-					try {

-						UMLDiagramEditorUtil.openDiagram(diagram);

-					} catch (PartInitException e) {

-						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

+		IRunnableWithProgress op =

+				new WorkspaceModifyOperation(null) {

+

+					@Override

+					protected void execute(IProgressMonitor monitor)

+							throws CoreException, InterruptedException {

+						diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),

+								domainModelFilePage.getURI(),

+								monitor);

+						if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {

+							try {

+								UMLDiagramEditorUtil.openDiagram(diagram);

+							} catch (PartInitException e) {

+								ErrorDialog.openError(getContainer().getShell(),

+										Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

+							}

+						}

 					}

-				}

-			}

-		};

+				};

 		try {

 			getContainer().run(false, true, op);

 		} catch (InterruptedException e) {

 			return false;

 		} catch (InvocationTargetException e) {

 			if (e.getTargetException() instanceof CoreException) {

-				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, ((CoreException) e.getTargetException()).getStatus());

+				ErrorDialog.openError(getContainer().getShell(),

+						Messages.UMLCreationWizardCreationError, null,

+						((CoreException) e.getTargetException()).getStatus());

 			} else {

 				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
index 5d0a528847d..b11f93abeee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
@@ -74,7 +74,8 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 	@Override

 	public void createControl(Composite parent) {

 		super.createControl(parent);

-		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));

+		setFileName(UMLDiagramEditorUtil.getUniqueFileName(

+				getContainerFullPath(), getFileName(), getExtension()));

 		setPageComplete(validatePage());

 	}

 

@@ -88,7 +89,8 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage {
 		}

 		String extension = getExtension();

 		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {

-			setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension));

+			setErrorMessage(NLS.bind(

+					Messages.UMLCreationWizardPageExtensionError, extension));

 			return false;

 		}

 		return true;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
index e270df7c6cd..850bc3ee5ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
@@ -61,7 +61,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createPackage_1000Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackage_1000SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getPackage_1000SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -72,8 +73,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_2060Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_2060OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_2060SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getActivity_2060OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getActivity_2060SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -85,8 +88,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_2061Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_2061OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_2061SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInteraction_2061OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getInteraction_2061SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -98,8 +103,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_2062Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachine_2062OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachine_2062SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -111,8 +118,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_2063Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_2063OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_2063SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getStateMachine_2063OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getStateMachine_2063SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -124,8 +133,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_2064Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getFunctionBehavior_2064OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getFunctionBehavior_2064SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -137,8 +148,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_2065Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehavior_2065OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehavior_2065SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -150,8 +163,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_2069Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_2069OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_2069SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getComponent_2069OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getComponent_2069SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -163,8 +178,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_2070Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_2070OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_2070SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDevice_2070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDevice_2070SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -176,8 +193,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_2071Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironment_2071OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironment_2071SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -189,8 +208,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_2072Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_2072OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_2072SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getNode_2072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getNode_2072SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -202,8 +223,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_2073Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_2073OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_2073SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getClass_2073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getClass_2073SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -215,7 +238,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_2075Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_2075OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getCollaboration_2075OutgoingLinks(view));

 		createCollaborationInternalstructure_7075Children(getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));

 	}

 

@@ -224,7 +248,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_2076Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_2076OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInterface_2076OutgoingLinks(view));

 	}

 

 	/**

@@ -232,7 +257,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_2066Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_2066OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getPrimitiveType_2066OutgoingLinks(view));

 	}

 

 	/**

@@ -240,8 +266,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_2067Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_2067OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_2067SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getEnumeration_2067OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getEnumeration_2067SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -253,7 +281,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_2068Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_2068OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDataType_2068OutgoingLinks(view));

 		createDataTypeAttributes_7033Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));

 		createDataTypeOperations_7034Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));

 	}

@@ -263,7 +292,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_2077Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_2077OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getActor_2077OutgoingLinks(view));

 	}

 

 	/**

@@ -271,7 +301,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_2078Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_2078OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDeploymentSpecification_2078OutgoingLinks(view));

 	}

 

 	/**

@@ -279,7 +310,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_2079Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_2079OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getArtifact_2079OutgoingLinks(view));

 	}

 

 	/**

@@ -287,7 +319,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_2080Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_2080OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInformationItem_2080OutgoingLinks(view));

 	}

 

 	/**

@@ -295,7 +328,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_2081Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_2081OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getSignal_2081OutgoingLinks(view));

 	}

 

 	/**

@@ -303,7 +337,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_2082Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_2082OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getUseCase_2082OutgoingLinks(view));

 	}

 

 	/**

@@ -311,7 +346,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignalEvent_2083Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignalEvent_2083OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getSignalEvent_2083OutgoingLinks(view));

 	}

 

 	/**

@@ -319,7 +355,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCallEvent_2084Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCallEvent_2084OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getCallEvent_2084OutgoingLinks(view));

 	}

 

 	/**

@@ -327,7 +364,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createAnyReceiveEvent_2085Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAnyReceiveEvent_2085OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getAnyReceiveEvent_2085OutgoingLinks(view));

 	}

 

 	/**

@@ -335,7 +373,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createChangeEvent_2088Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getChangeEvent_2088OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getChangeEvent_2088OutgoingLinks(view));

 	}

 

 	/**

@@ -343,7 +382,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeEvent_2089Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeEvent_2089OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeEvent_2089OutgoingLinks(view));

 	}

 

 	/**

@@ -351,7 +391,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationObservation_2093Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationObservation_2093OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDurationObservation_2093OutgoingLinks(view));

 	}

 

 	/**

@@ -359,7 +400,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeObservation_2094Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeObservation_2094OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeObservation_2094OutgoingLinks(view));

 	}

 

 	/**

@@ -367,7 +409,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralBoolean_2095Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralBoolean_2095OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getLiteralBoolean_2095OutgoingLinks(view));

 	}

 

 	/**

@@ -375,7 +418,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralInteger_2096Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralInteger_2096OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getLiteralInteger_2096OutgoingLinks(view));

 	}

 

 	/**

@@ -383,7 +427,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralNull_2097Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralNull_2097OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getLiteralNull_2097OutgoingLinks(view));

 	}

 

 	/**

@@ -391,7 +436,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralString_2098Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralString_2098OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getLiteralString_2098OutgoingLinks(view));

 	}

 

 	/**

@@ -399,7 +445,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createLiteralUnlimitedNatural_2099Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralUnlimitedNatural_2099OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getLiteralUnlimitedNatural_2099OutgoingLinks(view));

 	}

 

 	/**

@@ -407,7 +454,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStringExpression_2100Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStringExpression_2100OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getStringExpression_2100OutgoingLinks(view));

 	}

 

 	/**

@@ -415,7 +463,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueExpression_2101Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueExpression_2101OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getOpaqueExpression_2101OutgoingLinks(view));

 	}

 

 	/**

@@ -423,7 +472,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeExpression_2102Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeExpression_2102OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeExpression_2102OutgoingLinks(view));

 	}

 

 	/**

@@ -431,7 +481,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExpression_2103Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExpression_2103OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getExpression_2103OutgoingLinks(view));

 	}

 

 	/**

@@ -439,7 +490,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDuration_2104Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDuration_2104OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDuration_2104OutgoingLinks(view));

 	}

 

 	/**

@@ -447,7 +499,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeInterval_2105Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeInterval_2105OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeInterval_2105OutgoingLinks(view));

 	}

 

 	/**

@@ -455,7 +508,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationInterval_2106Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationInterval_2106OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDurationInterval_2106OutgoingLinks(view));

 	}

 

 	/**

@@ -463,7 +517,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterval_2107Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterval_2107OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInterval_2107OutgoingLinks(view));

 	}

 

 	/**

@@ -471,7 +526,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInstanceValue_2108Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInstanceValue_2108OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInstanceValue_2108OutgoingLinks(view));

 	}

 

 	/**

@@ -479,7 +535,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_2109Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_2109OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getComment_2109OutgoingLinks(view));

 	}

 

 	/**

@@ -487,7 +544,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_2110Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_2110OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDurationConstraint_2110OutgoingLinks(view));

 	}

 

 	/**

@@ -495,7 +553,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_2111Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_2111OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeConstraint_2111OutgoingLinks(view));

 	}

 

 	/**

@@ -503,7 +562,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_2112Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_2112OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getIntervalConstraint_2112OutgoingLinks(view));

 	}

 

 	/**

@@ -511,7 +571,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_2113Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_2113OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInteractionConstraint_2113OutgoingLinks(view));

 	}

 

 	/**

@@ -519,7 +580,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_2114Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_2114OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getConstraint_2114OutgoingLinks(view));

 	}

 

 	/**

@@ -527,7 +589,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPort_3069Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPort_3069OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getPort_3069OutgoingLinks(view));

 	}

 

 	/**

@@ -535,7 +598,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createParameter_3088Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getParameter_3088OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getParameter_3088OutgoingLinks(view));

 	}

 

 	/**

@@ -543,8 +607,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_3070Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3070OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProperty_3070SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getProperty_3070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getProperty_3070SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -556,7 +622,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConnectableElement_3115Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnectableElement_3115OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getConnectableElement_3115OutgoingLinks(view));

 	}

 

 	/**

@@ -564,7 +631,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaborationUse_3071Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaborationUse_3071OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getCollaborationUse_3071OutgoingLinks(view));

 	}

 

 	/**

@@ -572,8 +640,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActivity_3072Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_3072OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_3072SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getActivity_3072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getActivity_3072SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -585,8 +655,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteraction_3073Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_3073OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_3073SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInteraction_3073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getInteraction_3073SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -598,8 +670,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProtocolStateMachine_3074Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachine_3074OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachine_3074SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -611,8 +685,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createStateMachine_3075Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_3075OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_3075SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getStateMachine_3075OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getStateMachine_3075SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -624,8 +700,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createFunctionBehavior_3076Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getFunctionBehavior_3076OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getFunctionBehavior_3076SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -637,8 +715,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOpaqueBehavior_3077Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehavior_3077OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehavior_3077SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -650,8 +730,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComponent_3081Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_3081OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_3081SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getComponent_3081OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getComponent_3081SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -663,8 +745,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDevice_3082Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_3082OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_3082SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDevice_3082OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDevice_3082SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -676,8 +760,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createExecutionEnvironment_3083Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironment_3083OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironment_3083SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -689,8 +775,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createNode_3084Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_3084OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_3084SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getNode_3084OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getNode_3084SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -702,8 +790,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createClass_3085Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3085OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_3085SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getClass_3085OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getClass_3085SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -715,7 +805,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createCollaboration_3086Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_3086OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getCollaboration_3086OutgoingLinks(view));

 		createCollaborationInternalstructure_7061Children(getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));

 	}

 

@@ -724,7 +815,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInterface_3087Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_3087OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInterface_3087OutgoingLinks(view));

 	}

 

 	/**

@@ -732,7 +824,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createPrimitiveType_3078Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_3078OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getPrimitiveType_3078OutgoingLinks(view));

 	}

 

 	/**

@@ -740,8 +833,10 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumeration_3079Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_3079OutgoingLinks(view));

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_3079SemanticChildren(view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getEnumeration_3079OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getEnumeration_3079SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -753,7 +848,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDataType_3080Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_3080OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDataType_3080OutgoingLinks(view));

 		createDataTypeAttributes_7036Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

 		createDataTypeOperations_7037Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

 	}

@@ -763,7 +859,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createActor_3091Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_3091OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getActor_3091OutgoingLinks(view));

 	}

 

 	/**

@@ -771,7 +868,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDeploymentSpecification_3092Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_3092OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDeploymentSpecification_3092OutgoingLinks(view));

 	}

 

 	/**

@@ -779,7 +877,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createArtifact_3093Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_3093OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getArtifact_3093OutgoingLinks(view));

 	}

 

 	/**

@@ -787,7 +886,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInformationItem_3094Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_3094OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInformationItem_3094OutgoingLinks(view));

 	}

 

 	/**

@@ -795,7 +895,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createSignal_3095Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_3095OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getSignal_3095OutgoingLinks(view));

 	}

 

 	/**

@@ -803,7 +904,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createUseCase_3096Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_3096OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getUseCase_3096OutgoingLinks(view));

 	}

 

 	/**

@@ -811,7 +913,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createComment_3097Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_3097OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getComment_3097OutgoingLinks(view));

 	}

 

 	/**

@@ -819,7 +922,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createDurationConstraint_3116Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_3116OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getDurationConstraint_3116OutgoingLinks(view));

 	}

 

 	/**

@@ -827,7 +931,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createTimeConstraint_3117Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_3117OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getTimeConstraint_3117OutgoingLinks(view));

 	}

 

 	/**

@@ -835,7 +940,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createIntervalConstraint_3118Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_3118OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getIntervalConstraint_3118OutgoingLinks(view));

 	}

 

 	/**

@@ -843,7 +949,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createInteractionConstraint_3119Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_3119OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getInteractionConstraint_3119OutgoingLinks(view));

 	}

 

 	/**

@@ -851,7 +958,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createConstraint_3120Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_3120OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getConstraint_3120OutgoingLinks(view));

 	}

 

 	/**

@@ -859,7 +967,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createProperty_3101Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3101OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getProperty_3101OutgoingLinks(view));

 	}

 

 	/**

@@ -867,7 +976,8 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createOperation_3102Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3102OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getOperation_3102OutgoingLinks(view));

 	}

 

 	/**

@@ -875,14 +985,16 @@ public class UMLDiagramContentInitializer {
 	 */

 	private void createEnumerationLiteral_3066Children(View view) {

 		myDomain2NotationMap.put(view.getElement(), view);

-		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_3066OutgoingLinks(view));

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+				.getEnumerationLiteral_3066OutgoingLinks(view));

 	}

 

 	/**

 	 * @generated

 	 */

 	private void createDataTypeAttributes_7033Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7033SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDataTypeAttributes_7033SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -892,7 +1004,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeOperations_7034Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7034SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDataTypeOperations_7034SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -902,7 +1015,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeAttributes_7036Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7036SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDataTypeAttributes_7036SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -912,7 +1026,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDataTypeOperations_7037Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7037SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDataTypeOperations_7037SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -922,7 +1037,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createEnumerationLiterals_7048Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7048SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getEnumerationLiterals_7048SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -932,7 +1048,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createEnumerationLiterals_7049Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7049SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getEnumerationLiterals_7049SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -942,7 +1059,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createActivityInternalstructure_7050Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7050SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getActivityInternalstructure_7050SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -952,7 +1070,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createInteractionInternalstructure_7051Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7051SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getInteractionInternalstructure_7051SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -962,7 +1081,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createProtocolStateMachineInternalstructure_7052Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -972,7 +1092,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createStateMachineInternalstructure_7053Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7053SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getStateMachineInternalstructure_7053SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -982,7 +1103,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createFunctionBehaviorInternalstructure_7054Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -992,7 +1114,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createOpaqueBehaviorInternalstructure_7055Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1002,7 +1125,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createComponentInternalstructure_7056Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7056SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getComponentInternalstructure_7056SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1012,7 +1136,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDeviceInternalstructure_7057Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7057SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDeviceInternalstructure_7057SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1022,7 +1147,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createExecutionEnvironmentInternalstructure_7058Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1032,7 +1158,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createNodeInternalstructure_7059Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7059SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getNodeInternalstructure_7059SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1042,7 +1169,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createClassInternalstructure_7060Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7060SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getClassInternalstructure_7060SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1052,7 +1180,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createCollaborationInternalstructure_7061Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7061SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getCollaborationInternalstructure_7061SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1062,7 +1191,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createActivityInternalstructure_7063Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7063SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getActivityInternalstructure_7063SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1072,7 +1202,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createInteractionInternalstructure_7064Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7064SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getInteractionInternalstructure_7064SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1082,7 +1213,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createProtocolStateMachineInternalstructure_7065Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1092,7 +1224,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createStateMachineInternalstructure_7066Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7066SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getStateMachineInternalstructure_7066SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1102,7 +1235,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createFunctionBehaviorInternalstructure_7067Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1112,7 +1246,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createOpaqueBehaviorInternalstructure_7068Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1122,7 +1257,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createComponentInternalstructure_7069Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7069SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getComponentInternalstructure_7069SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1132,7 +1268,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createDeviceInternalstructure_7070Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7070SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getDeviceInternalstructure_7070SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1142,7 +1279,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createExecutionEnvironmentInternalstructure_7071Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1152,7 +1290,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createNodeInternalstructure_7072Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7072SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getNodeInternalstructure_7072SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1162,7 +1301,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createClassInternalstructure_7073Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7073SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getClassInternalstructure_7073SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1172,7 +1312,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createCollaborationInternalstructure_7075Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7075SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getCollaborationInternalstructure_7075SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1182,7 +1323,8 @@ public class UMLDiagramContentInitializer {
 	 * @generated

 	 */

 	private void createPropertyInternalstructure_7077Children(View view) {

-		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPropertyInternalstructure_7077SemanticChildren(view);

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE

+				.getPropertyInternalstructure_7077SemanticChildren(view);

 		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

 			createNode(view, (UMLNodeDescriptor) it.next());

 		}

@@ -1477,43 +1619,56 @@ public class UMLDiagramContentInitializer {
 					continueLinkCreation = true;

 					switch (nextLinkDescriptor.getVisualID()) {

 					case ComponentRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponentRealization_4004OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getComponentRealization_4004OutgoingLinks(edge));

 						break;

 					case InterfaceRealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterfaceRealization_4005OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getInterfaceRealization_4005OutgoingLinks(edge));

 						break;

 					case SubstitutionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSubstitution_4011OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getSubstitution_4011OutgoingLinks(edge));

 						break;

 					case RealizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getRealization_4006OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getRealization_4006OutgoingLinks(edge));

 						break;

 					case ManifestationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getManifestation_4012OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getManifestation_4012OutgoingLinks(edge));

 						break;

 					case AbstractionEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAbstraction_4007OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getAbstraction_4007OutgoingLinks(edge));

 						break;

 					case UsageEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUsage_4008OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getUsage_4008OutgoingLinks(edge));

 						break;

 					case DeploymentEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeployment_4009OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getDeployment_4009OutgoingLinks(edge));

 						break;

 					case RoleBindingEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4017OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getDependency_4017OutgoingLinks(edge));

 						break;

 					case DependencyEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4010OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getDependency_4010OutgoingLinks(edge));

 						break;

 					case ConnectorEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnector_4013OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getConnector_4013OutgoingLinks(edge));

 						break;

 					case GeneralizationEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_4015OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getGeneralization_4015OutgoingLinks(edge));

 						break;

 					case InformationFlowEditPart.VISUAL_ID:

-						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationFlow_4021OutgoingLinks(edge));

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE

+								.getInformationFlow_4021OutgoingLinks(edge));

 						break;

 					}

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
index dc11b7216cf..1998192cee7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
@@ -102,13 +102,17 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 */

 	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {

 		super(servicesRegistry, diagram);

+

 		// adds a listener to the palette service, which reacts to palette customizations

 		PapyrusPaletteService.getInstance().addProviderChangeListener(this);

+

 		// Share the same editing provider

 		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);

 		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);

+

 		// overrides editing domain created by super constructor

 		setDocumentProvider(documentProvider);

+

 	}

 

 	/**

@@ -221,7 +225,8 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	@Override

 	protected void configureGraphicalViewer() {

 		super.configureGraphicalViewer();

-		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());

+		DiagramEditorContextMenuProvider provider =

+				new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());

 		getDiagramGraphicalViewer().setContextMenu(provider);

 		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());

 	}

@@ -278,6 +283,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			dirtyState.dispose();

 			dirtyState = null;

 		}

+

 		super.setUndoContext(context);

 	}

 

@@ -296,7 +302,8 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	public void providerChanged(ProviderChangeEvent event) {

 		// update the palette if the palette service has changed

 		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {

-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());

+			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this,

+					getDefaultPaletteContent());

 		}

 	}

 

@@ -308,10 +315,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		// remove palette service listener

 		// remove preference listener

 		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);

+

 		if (dirtyState != null) {

 			dirtyState.dispose();

 			dirtyState = null;

 		}

+

 		super.dispose();

 	}

 

@@ -348,10 +357,13 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			@Override

 			protected void configurePaletteViewer(PaletteViewer viewer) {

 				super.configurePaletteViewer(viewer);

+

 				// customize menu...

 				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));

+

 				viewer.getKeyHandler().setParent(getPaletteKeyHandler());

 				viewer.getControl().addMouseListener(getPaletteMouseListener());

+

 				// Add a transfer drag target listener that is supported on

 				// palette template entries whose template is a creation tool.

 				// This will enable drag and drop of the palette shape creation

@@ -373,7 +385,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			 * @return Palette Key Handler for the palette

 			 */

 			private KeyHandler getPaletteKeyHandler() {

+

 				if (paletteKeyHandler == null) {

+

 					paletteKeyHandler = new KeyHandler() {

 

 						/**

@@ -388,18 +402,27 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						 */

 						@Override

 						public boolean keyReleased(KeyEvent event) {

+

 							if (event.keyCode == SWT.Selection) {

+

 								Tool tool = getPaletteViewer().getActiveTool().createTool();

+

 								if (toolSupportsAccessibility(tool)) {

+

 									tool.keyUp(event, getDiagramGraphicalViewer());

+

 									// deactivate current selection

 									getPaletteViewer().setActiveTool(null);

+

 									return true;

 								}

+

 							}

 							return super.keyReleased(event);

 						}

+

 					};

+

 				}

 				return paletteKeyHandler;

 			}

@@ -408,7 +431,9 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 			 * @return Palette Mouse listener for the palette

 			 */

 			private MouseListener getPaletteMouseListener() {

+

 				if (paletteMouseListener == null) {

+

 					paletteMouseListener = new MouseListener() {

 

 						/**

@@ -426,10 +451,13 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 						@Override

 						public void mouseDoubleClick(MouseEvent e) {

 							Tool tool = getPaletteViewer().getActiveTool().createTool();

+

 							if (toolSupportsAccessibility(tool)) {

+

 								tool.setViewer(getDiagramGraphicalViewer());

 								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());

 								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());

+

 								// Current active tool should be deactivated,

 								// but if it is down here it will get

 								// reactivated deep in GEF palette code after

@@ -451,11 +479,14 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 								getPaletteViewer().setActiveTool(null);

 								clearActiveTool = false;

 							}

+

 						}

 					};

+

 				}

 				return paletteMouseListener;

 			}

+

 		};

 	}

 

@@ -473,20 +504,23 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	@Override

 	protected void initializeGraphicalViewer() {

 		super.initializeGraphicalViewer();

+

 		// Enable Drop

-		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

+		getDiagramGraphicalViewer().addDropTargetListener(

+				new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

 

-			@Override

-			protected Object getJavaObject(TransferData data) {

-				// It is usual for the transfer data not to be set because it is available locally

-				return LocalSelectionTransfer.getTransfer().getSelection();

-			}

+					@Override

+					protected Object getJavaObject(TransferData data) {

+						// It is usual for the transfer data not to be set because it is available locally

+						return LocalSelectionTransfer.getTransfer().getSelection();

+					}

+

+					@Override

+					protected TransactionalEditingDomain getTransactionalEditingDomain() {

+						return getEditingDomain();

+					}

+				});

 

-			@Override

-			protected TransactionalEditingDomain getTransactionalEditingDomain() {

-				return getEditingDomain();

-			}

-		});

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
index 945c6e7744b..0fd9d3efcc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
@@ -93,6 +93,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 		adapterFactory = org.eclipse.papyrus.infra.gmfdiag.common.Activator.getInstance().getItemProvidersAdapterFactory();

 		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();

 		diagramPreferenceInitializer.initializeDefaultPreferences();

+

 	}

 

 	/**

@@ -134,9 +135,12 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	 * @generated

 	 */

 	public ImageDescriptor getItemImageDescriptor(Object item) {

-		IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class);

+		IItemLabelProvider labelProvider =

+				(IItemLabelProvider) adapterFactory.adapt(

+						item, IItemLabelProvider.class);

 		if (labelProvider != null) {

-			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));

+			return ExtendedImageRegistry.getInstance().getImageDescriptor(

+					labelProvider.getImage(item));

 		}

 		return null;

 	}

@@ -167,7 +171,8 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	public static ImageDescriptor findImageDescriptor(String path) {

 		final IPath p = new Path(path);

 		if (p.isAbsolute() && p.segmentCount() > 1) {

-			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

+			return AbstractUIPlugin.imageDescriptorFromPlugin(

+					p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

 		} else {

 			return getBundledImageDescriptor(p.makeAbsolute().toString());

 		}

@@ -197,7 +202,8 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
 	 * @generated

 	 */

 	public static String getString(String key) {

-		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

+		return Platform.getResourceString(

+				getInstance().getBundle(), "%" + key); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
index 1e271af214a..8ee4a464e25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
@@ -110,7 +110,8 @@ public class UMLDiagramEditorUtil {
 	 * @generated

 	 */

 	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {

-		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

+		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension,

+				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

 	}

 

 	/**

@@ -143,21 +144,25 @@ public class UMLDiagramEditorUtil {
 		final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);

 		final String diagramName = diagramURI.lastSegment();

 		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {

-

 			@Override

 			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 				Package model = createInitialModel();

 				attachModelToResource(model, modelResource);

-				Diagram diagram = ViewService.createDiagram(model, CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+

+				Diagram diagram = ViewService.createDiagram(

+						model,

+						CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

 				if (diagram != null) {

 					diagramResource.getContents().add(diagram);

 					diagram.setName(diagramName);

 					diagram.setElement(model);

 				}

+

 				try {

 					modelResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

 					diagramResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

+

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

 				}

 				return CommandResult.newOKCommandResult();

@@ -177,7 +182,6 @@ public class UMLDiagramEditorUtil {
 	 * Create a new instance of domain element associated with canvas.

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

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

-	 *

 	 * @generated

 	 */

 	private static Package createInitialModel() {

@@ -188,7 +192,6 @@ public class UMLDiagramEditorUtil {
 	 * Store model element in the resource.

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

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

-	 *

 	 * @generated

 	 */

 	private static void attachModelToResource(Package model, Resource resource) {

@@ -200,6 +203,7 @@ public class UMLDiagramEditorUtil {
 	 */

 	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {

 		diagramPart.getDiagramGraphicalViewer().deselectAll();

+

 		EditPart firstPrimary = null;

 		for (EditPart nextPart : editParts) {

 			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);

@@ -207,6 +211,7 @@ public class UMLDiagramEditorUtil {
 				firstPrimary = nextPart;

 			}

 		}

+

 		if (!editParts.isEmpty()) {

 			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));

 		}

@@ -218,6 +223,7 @@ public class UMLDiagramEditorUtil {
 	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) {

 		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();

 		final int intialNumOfEditParts = editPartCollector.size();

+

 		if (element instanceof View) { // support notation element lookup

 			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element);

 			if (editPart != null) {

@@ -225,6 +231,7 @@ public class UMLDiagramEditorUtil {
 				return 1;

 			}

 		}

+

 		String elementID = EMFCoreUtil.getProxyID(element);

 		@SuppressWarnings("unchecked")

 		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);

@@ -238,6 +245,7 @@ public class UMLDiagramEditorUtil {
 				editPartCollector.add(nextPart);

 			}

 		}

+

 		if (intialNumOfEditParts == editPartCollector.size()) {

 			if (!associatedParts.isEmpty()) {

 				editPartCollector.add(associatedParts.get(0));

@@ -258,6 +266,7 @@ public class UMLDiagramEditorUtil {
 		if (targetElement.eResource() instanceof XMLResource) {

 			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;

 		}

+

 		View view = null;

 		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

 		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

@@ -266,6 +275,7 @@ public class UMLDiagramEditorUtil {
 			EditPart editPart = editPartHolder.get(0);

 			view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null;

 		}

+

 		return (view == null) ? diagramEditPart.getDiagramView() : view;

 	}

 

@@ -314,6 +324,7 @@ public class UMLDiagramEditorUtil {
 						}

 					}

 				}

+

 				buildElement2ViewMap(scope, element2ViewMap, elementSet);

 			}

 			return element2ViewMap;

@@ -326,6 +337,7 @@ public class UMLDiagramEditorUtil {
 			if (elements.size() == element2ViewMap.size()) {

 				return true;

 			}

+

 			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {

 				element2ViewMap.put(parentView.getElement(), parentView);

 				if (elements.size() == element2ViewMap.size()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
index 99969014d04..c8a6e3ef837 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
@@ -63,6 +63,7 @@ public class UMLDiagramUpdateCommand implements IHandler {
 					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

 					nextEditPolicy.refresh();

 				}

+

 			}

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
index e3b545da989..592aae166b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
@@ -117,7 +117,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated

 	 */

 	protected UMLDiagramUpdater() {

-		// to prevent instantiation allowing the override

+		//to prevent instantiation allowing the override

 	}

 

 	/**

@@ -253,7 +253,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Package modelElement = (Package) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getPackagedElements()

+				.iterator(); it.hasNext();) {

 			PackageableElement childElement = (PackageableElement) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPart.VISUAL_ID) {

@@ -429,7 +430,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPart.VISUAL_ID) {

@@ -437,7 +439,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPart.VISUAL_ID) {

@@ -473,7 +476,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -481,7 +485,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -501,7 +506,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -509,7 +515,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -529,7 +536,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -537,7 +545,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -557,7 +566,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -565,7 +575,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -585,7 +596,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -593,7 +605,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -613,7 +626,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -621,7 +635,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -641,7 +656,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -661,7 +677,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -681,7 +698,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -701,7 +719,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -721,7 +740,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -741,7 +761,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals()

+				.iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

@@ -769,7 +790,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -777,7 +799,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -797,7 +820,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -805,7 +829,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -825,7 +850,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -833,7 +859,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -853,7 +880,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -861,7 +889,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -881,7 +910,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -889,7 +919,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -909,7 +940,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -917,7 +949,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -937,7 +970,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -957,7 +991,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -977,7 +1012,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -997,7 +1033,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -1017,7 +1054,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PortEditPart.VISUAL_ID) {

@@ -1037,7 +1075,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals()

+				.iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

@@ -1061,7 +1100,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyEditPartCLN.VISUAL_ID) {

@@ -1085,7 +1125,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedOperations()

+				.iterator(); it.hasNext();) {

 			Operation childElement = (Operation) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == OperationEditPartCLN.VISUAL_ID) {

@@ -1109,7 +1150,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyEditPartCLN.VISUAL_ID) {

@@ -1133,7 +1175,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		DataType modelElement = (DataType) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedOperations()

+				.iterator(); it.hasNext();) {

 			Operation childElement = (Operation) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == OperationEditPartCLN.VISUAL_ID) {

@@ -1157,7 +1200,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals()

+				.iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

@@ -1181,7 +1225,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Enumeration modelElement = (Enumeration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedLiterals()

+				.iterator(); it.hasNext();) {

 			EnumerationLiteral childElement = (EnumerationLiteral) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

@@ -1205,7 +1250,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -1213,7 +1259,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -1221,7 +1268,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -1229,7 +1277,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -1321,7 +1370,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -1329,7 +1379,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -1369,7 +1420,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -1377,7 +1429,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -1385,7 +1438,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -1393,7 +1447,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -1485,7 +1540,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -1493,7 +1549,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -1533,7 +1590,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -1541,7 +1599,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -1549,7 +1608,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -1557,7 +1617,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -1649,7 +1710,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -1657,7 +1719,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -1697,7 +1760,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -1705,7 +1769,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -1713,7 +1778,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -1721,7 +1787,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -1813,7 +1880,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -1821,7 +1889,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -1861,7 +1930,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -1869,7 +1939,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -1877,7 +1948,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -1885,7 +1957,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -1977,7 +2050,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -1985,7 +2059,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2025,7 +2100,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -2033,7 +2109,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2041,7 +2118,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2049,7 +2127,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2141,7 +2220,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2149,7 +2229,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2189,7 +2270,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2197,7 +2279,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2205,7 +2288,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2297,7 +2381,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2305,7 +2390,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2345,7 +2431,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2353,7 +2440,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2361,7 +2449,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2453,7 +2542,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2461,7 +2551,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2501,7 +2592,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2509,7 +2601,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2517,7 +2610,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2609,7 +2703,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2617,7 +2712,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2657,7 +2753,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2665,7 +2762,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2673,7 +2771,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2765,7 +2864,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2773,7 +2873,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2813,7 +2914,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2821,7 +2923,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2829,7 +2932,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -2921,7 +3025,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2929,7 +3034,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -2969,7 +3075,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Collaboration modelElement = (Collaboration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -2977,7 +3084,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -2985,7 +3093,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -2993,7 +3102,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getRoles()

+				.iterator(); it.hasNext();) {

 			ConnectableElement childElement = (ConnectableElement) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

@@ -3001,7 +3111,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3041,7 +3152,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Activity modelElement = (Activity) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3049,7 +3161,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3057,7 +3170,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3065,7 +3179,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3157,7 +3272,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3165,7 +3281,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3205,7 +3322,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Interaction modelElement = (Interaction) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3213,7 +3331,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3221,7 +3340,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3229,7 +3349,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3321,7 +3442,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3329,7 +3451,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3369,7 +3492,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3377,7 +3501,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3385,7 +3510,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3393,7 +3519,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3485,7 +3612,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3493,7 +3621,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3533,7 +3662,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		StateMachine modelElement = (StateMachine) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3541,7 +3671,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3549,7 +3680,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3557,7 +3689,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3649,7 +3782,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3657,7 +3791,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3697,7 +3832,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3705,7 +3841,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3713,7 +3850,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3721,7 +3859,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3813,7 +3952,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3821,7 +3961,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -3861,7 +4002,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedParameters()

+				.iterator(); it.hasNext();) {

 			Parameter childElement = (Parameter) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ParameterEditPart.VISUAL_ID) {

@@ -3869,7 +4011,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -3877,7 +4020,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -3885,7 +4029,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -3977,7 +4122,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -3985,7 +4131,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -4025,7 +4172,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Component modelElement = (Component) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4033,7 +4181,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4041,7 +4190,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -4133,7 +4283,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4141,7 +4292,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -4181,7 +4333,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Device modelElement = (Device) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4189,7 +4342,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4197,7 +4351,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -4289,7 +4444,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4297,7 +4453,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -4337,7 +4494,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4345,7 +4503,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4353,7 +4512,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -4445,7 +4605,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4453,7 +4614,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -4493,7 +4655,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Node modelElement = (Node) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4501,7 +4664,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4509,7 +4673,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -4601,7 +4766,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4609,7 +4775,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -4649,7 +4816,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Class modelElement = (Class) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4657,7 +4825,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4665,7 +4834,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getNestedClassifiers()

+				.iterator(); it.hasNext();) {

 			Classifier childElement = (Classifier) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

@@ -4757,7 +4927,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4765,7 +4936,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == ConstraintEditPartCN.VISUAL_ID) {

@@ -4805,7 +4977,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		}

 		Collaboration modelElement = (Collaboration) containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedAttributes()

+				.iterator(); it.hasNext();) {

 			Property childElement = (Property) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {

@@ -4813,7 +4986,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getCollaborationUses()

+				.iterator(); it.hasNext();) {

 			CollaborationUse childElement = (CollaborationUse) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {

@@ -4821,7 +4995,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedComments()

+				.iterator(); it.hasNext();) {

 			Comment childElement = (Comment) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CommentEditPartCN.VISUAL_ID) {

@@ -4829,7 +5004,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getRoles()

+				.iterator(); it.hasNext();) {

 			ConnectableElement childElement = (ConnectableElement) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

@@ -4837,7 +5013,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				continue;

 			}

 		}

-		for (Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+		for (Iterator<?> it = modelElement.getOwnedRules()

+				.iterator(); it.hasNext();) {

 			Constraint childElement = (Constraint) it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {

@@ -5498,17 +5675,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPackage_1000ContainedLinks(View view) {

 		Package modelElement = (Package) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -5518,8 +5706,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActivity_2060ContainedLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5529,8 +5719,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteraction_2061ContainedLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5540,8 +5732,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getProtocolStateMachine_2062ContainedLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5551,8 +5745,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getStateMachine_2063ContainedLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5562,8 +5758,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getFunctionBehavior_2064ContainedLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5573,8 +5771,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getOpaqueBehavior_2065ContainedLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5584,8 +5784,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComponent_2069ContainedLinks(View view) {

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5595,8 +5797,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDevice_2070ContainedLinks(View view) {

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5606,8 +5810,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getExecutionEnvironment_2071ContainedLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5617,8 +5823,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getNode_2072ContainedLinks(View view) {

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5628,8 +5836,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getClass_2073ContainedLinks(View view) {

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5639,8 +5849,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCollaboration_2075ContainedLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5650,7 +5862,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterface_2076ContainedLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5660,7 +5873,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPrimitiveType_2066ContainedLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5670,7 +5884,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getEnumeration_2067ContainedLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5680,7 +5895,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDataType_2068ContainedLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5690,7 +5906,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActor_2077ContainedLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5700,7 +5917,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDeploymentSpecification_2078ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5710,7 +5928,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getArtifact_2079ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5720,8 +5939,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInformationItem_2080ContainedLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement));

 		return result;

 	}

 

@@ -5731,7 +5952,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSignal_2081ContainedLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5741,7 +5963,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getUseCase_2082ContainedLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -5786,7 +6009,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationObservation_2093ContainedLinks(View view) {

 		DurationObservation modelElement = (DurationObservation) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement));

 		return result;

 	}

 

@@ -5796,7 +6020,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeObservation_2094ContainedLinks(View view) {

 		TimeObservation modelElement = (TimeObservation) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement));

 		return result;

 	}

 

@@ -5904,7 +6129,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComment_2109ContainedLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement));

 		return result;

 	}

 

@@ -5914,7 +6140,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationConstraint_2110ContainedLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -5924,7 +6151,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeConstraint_2111ContainedLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -5934,7 +6162,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getIntervalConstraint_2112ContainedLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -5944,7 +6173,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteractionConstraint_2113ContainedLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -5954,7 +6184,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConstraint_2114ContainedLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -5999,8 +6230,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActivity_3072ContainedLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6010,8 +6243,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteraction_3073ContainedLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6021,8 +6256,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getProtocolStateMachine_3074ContainedLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6032,8 +6269,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getStateMachine_3075ContainedLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6043,8 +6282,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getFunctionBehavior_3076ContainedLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6054,8 +6295,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getOpaqueBehavior_3077ContainedLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6065,8 +6308,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComponent_3081ContainedLinks(View view) {

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6076,8 +6321,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDevice_3082ContainedLinks(View view) {

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6087,8 +6334,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getExecutionEnvironment_3083ContainedLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6098,8 +6347,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getNode_3084ContainedLinks(View view) {

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6109,8 +6360,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getClass_3085ContainedLinks(View view) {

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6120,8 +6373,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCollaboration_3086ContainedLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013

+				(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6131,7 +6386,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterface_3087ContainedLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6141,7 +6397,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPrimitiveType_3078ContainedLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6151,7 +6408,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getEnumeration_3079ContainedLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6161,7 +6419,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDataType_3080ContainedLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6171,7 +6430,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActor_3091ContainedLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6181,7 +6441,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDeploymentSpecification_3092ContainedLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6191,7 +6452,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getArtifact_3093ContainedLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6201,8 +6463,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInformationItem_3094ContainedLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement));

 		return result;

 	}

 

@@ -6212,7 +6476,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSignal_3095ContainedLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6222,7 +6487,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getUseCase_3096ContainedLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015

+				(modelElement));

 		return result;

 	}

 

@@ -6232,7 +6498,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComment_3097ContainedLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement));

 		return result;

 	}

 

@@ -6242,7 +6509,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationConstraint_3116ContainedLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -6252,7 +6520,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeConstraint_3117ContainedLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -6262,7 +6531,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getIntervalConstraint_3118ContainedLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -6272,7 +6542,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteractionConstraint_3119ContainedLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -6282,7 +6553,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConstraint_3120ContainedLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

 		return result;

 	}

 

@@ -6405,23 +6677,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Activity modelElement = (Activity) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6432,23 +6721,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Interaction modelElement = (Interaction) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6459,23 +6765,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6486,23 +6809,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		StateMachine modelElement = (StateMachine) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6513,23 +6853,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6540,23 +6897,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6567,23 +6941,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Component modelElement = (Component) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6594,23 +6985,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Device modelElement = (Device) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6621,23 +7029,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6648,23 +7073,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Node modelElement = (Node) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6675,23 +7117,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Class modelElement = (Class) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6702,23 +7161,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Collaboration modelElement = (Collaboration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6729,23 +7205,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Interface modelElement = (Interface) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6756,23 +7249,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6783,23 +7293,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Enumeration modelElement = (Enumeration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6810,23 +7337,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DataType modelElement = (DataType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6837,23 +7381,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Actor modelElement = (Actor) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6864,23 +7425,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6891,23 +7469,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Artifact modelElement = (Artifact) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6918,23 +7513,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InformationItem modelElement = (InformationItem) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6945,23 +7557,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Signal modelElement = (Signal) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6972,23 +7601,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		UseCase modelElement = (UseCase) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -6999,21 +7645,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		SignalEvent modelElement = (SignalEvent) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7024,21 +7685,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		CallEvent modelElement = (CallEvent) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7049,21 +7725,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7074,21 +7765,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ChangeEvent modelElement = (ChangeEvent) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7099,21 +7805,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeEvent modelElement = (TimeEvent) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7124,21 +7845,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DurationObservation modelElement = (DurationObservation) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7149,21 +7885,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeObservation modelElement = (TimeObservation) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7174,21 +7925,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7199,21 +7965,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		LiteralInteger modelElement = (LiteralInteger) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7224,21 +8005,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		LiteralNull modelElement = (LiteralNull) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7249,21 +8045,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		LiteralString modelElement = (LiteralString) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7274,21 +8085,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7299,21 +8125,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		StringExpression modelElement = (StringExpression) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7324,21 +8165,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7349,21 +8205,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeExpression modelElement = (TimeExpression) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7374,21 +8245,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Expression modelElement = (Expression) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7399,21 +8285,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Duration modelElement = (Duration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7424,21 +8325,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeInterval modelElement = (TimeInterval) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7449,21 +8365,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DurationInterval modelElement = (DurationInterval) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7474,21 +8405,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Interval modelElement = (Interval) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7499,21 +8445,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InstanceValue modelElement = (InstanceValue) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7524,8 +8485,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Comment modelElement = (Comment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7536,21 +8499,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7561,21 +8539,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7586,21 +8579,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7611,21 +8619,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7636,21 +8659,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Constraint modelElement = (Constraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7661,21 +8699,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Port modelElement = (Port) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7686,21 +8739,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Parameter modelElement = (Parameter) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7711,21 +8779,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Property modelElement = (Property) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7736,21 +8819,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ConnectableElement modelElement = (ConnectableElement) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7761,21 +8859,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		CollaborationUse modelElement = (CollaborationUse) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7786,23 +8899,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Activity modelElement = (Activity) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7813,23 +8943,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Interaction modelElement = (Interaction) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7840,23 +8987,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7867,23 +9031,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		StateMachine modelElement = (StateMachine) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7894,23 +9075,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7921,23 +9119,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7948,23 +9163,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Component modelElement = (Component) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -7975,23 +9207,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Device modelElement = (Device) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8002,23 +9251,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8029,23 +9295,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Node modelElement = (Node) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8056,23 +9339,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Class modelElement = (Class) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8083,23 +9383,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Collaboration modelElement = (Collaboration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8110,23 +9427,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Interface modelElement = (Interface) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8137,23 +9471,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8164,23 +9515,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Enumeration modelElement = (Enumeration) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8191,23 +9559,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DataType modelElement = (DataType) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8218,23 +9603,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Actor modelElement = (Actor) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8245,23 +9647,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8272,23 +9691,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Artifact modelElement = (Artifact) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8299,23 +9735,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InformationItem modelElement = (InformationItem) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8326,23 +9779,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Signal modelElement = (Signal) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8353,23 +9823,40 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		UseCase modelElement = (UseCase) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8380,8 +9867,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Comment modelElement = (Comment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8392,21 +9881,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8417,21 +9921,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8442,21 +9961,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8467,21 +10001,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8492,21 +10041,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Constraint modelElement = (Constraint) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8538,21 +10102,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		ComponentRealization modelElement = (ComponentRealization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8563,21 +10142,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8588,21 +10182,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Substitution modelElement = (Substitution) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8613,21 +10222,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Realization modelElement = (Realization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8638,21 +10262,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Manifestation modelElement = (Manifestation) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8663,21 +10302,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Abstraction modelElement = (Abstraction) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8688,21 +10342,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Usage modelElement = (Usage) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8713,21 +10382,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Deployment modelElement = (Deployment) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8738,21 +10422,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Dependency modelElement = (Dependency) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8763,21 +10462,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Dependency modelElement = (Dependency) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8788,21 +10502,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Connector modelElement = (Connector) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8813,8 +10542,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		Generalization modelElement = (Generalization) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8825,21 +10556,36 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InformationFlow modelElement = (InformationFlow) view.getElement();

 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement, crossReferencer));

 		return result;

 	}

 

@@ -8849,18 +10595,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActivity_2060OutgoingLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8870,18 +10628,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteraction_2061OutgoingLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8891,18 +10661,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getProtocolStateMachine_2062OutgoingLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8912,18 +10694,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getStateMachine_2063OutgoingLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8933,18 +10727,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getFunctionBehavior_2064OutgoingLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8954,18 +10760,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getOpaqueBehavior_2065OutgoingLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8975,18 +10793,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComponent_2069OutgoingLinks(View view) {

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -8996,18 +10826,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDevice_2070OutgoingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9017,18 +10859,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getExecutionEnvironment_2071OutgoingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9038,18 +10892,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getNode_2072OutgoingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9059,18 +10925,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getClass_2073OutgoingLinks(View view) {

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9080,18 +10958,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCollaboration_2075OutgoingLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9101,18 +10991,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterface_2076OutgoingLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9122,18 +11024,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPrimitiveType_2066OutgoingLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9143,18 +11057,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getEnumeration_2067OutgoingLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9164,18 +11090,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDataType_2068OutgoingLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9185,18 +11123,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActor_2077OutgoingLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9206,18 +11156,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDeploymentSpecification_2078OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9227,18 +11189,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getArtifact_2079OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9248,19 +11222,32 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInformationItem_2080OutgoingLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9270,18 +11257,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSignal_2081OutgoingLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9291,18 +11290,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getUseCase_2082OutgoingLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9312,17 +11323,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSignalEvent_2083OutgoingLinks(View view) {

 		SignalEvent modelElement = (SignalEvent) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9332,17 +11354,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCallEvent_2084OutgoingLinks(View view) {

 		CallEvent modelElement = (CallEvent) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9352,17 +11385,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085OutgoingLinks(View view) {

 		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9372,17 +11416,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getChangeEvent_2088OutgoingLinks(View view) {

 		ChangeEvent modelElement = (ChangeEvent) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9392,17 +11447,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeEvent_2089OutgoingLinks(View view) {

 		TimeEvent modelElement = (TimeEvent) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9412,18 +11478,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationObservation_2093OutgoingLinks(View view) {

 		DurationObservation modelElement = (DurationObservation) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9433,18 +11511,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeObservation_2094OutgoingLinks(View view) {

 		TimeObservation modelElement = (TimeObservation) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9454,17 +11544,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getLiteralBoolean_2095OutgoingLinks(View view) {

 		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9474,17 +11575,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getLiteralInteger_2096OutgoingLinks(View view) {

 		LiteralInteger modelElement = (LiteralInteger) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9494,17 +11606,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getLiteralNull_2097OutgoingLinks(View view) {

 		LiteralNull modelElement = (LiteralNull) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9514,17 +11637,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getLiteralString_2098OutgoingLinks(View view) {

 		LiteralString modelElement = (LiteralString) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9534,17 +11668,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099OutgoingLinks(View view) {

 		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9554,17 +11699,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getStringExpression_2100OutgoingLinks(View view) {

 		StringExpression modelElement = (StringExpression) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9574,17 +11730,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getOpaqueExpression_2101OutgoingLinks(View view) {

 		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9594,17 +11761,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeExpression_2102OutgoingLinks(View view) {

 		TimeExpression modelElement = (TimeExpression) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9614,17 +11792,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getExpression_2103OutgoingLinks(View view) {

 		Expression modelElement = (Expression) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9634,17 +11823,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDuration_2104OutgoingLinks(View view) {

 		Duration modelElement = (Duration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9654,17 +11854,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeInterval_2105OutgoingLinks(View view) {

 		TimeInterval modelElement = (TimeInterval) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9674,17 +11885,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationInterval_2106OutgoingLinks(View view) {

 		DurationInterval modelElement = (DurationInterval) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9694,17 +11916,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterval_2107OutgoingLinks(View view) {

 		Interval modelElement = (Interval) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9714,17 +11947,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInstanceValue_2108OutgoingLinks(View view) {

 		InstanceValue modelElement = (InstanceValue) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9734,7 +11978,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComment_2109OutgoingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement));

 		return result;

 	}

 

@@ -9744,18 +11989,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationConstraint_2110OutgoingLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9765,18 +12022,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeConstraint_2111OutgoingLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9786,18 +12055,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getIntervalConstraint_2112OutgoingLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9807,18 +12088,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteractionConstraint_2113OutgoingLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9828,18 +12121,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9849,17 +12154,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPort_3069OutgoingLinks(View view) {

 		Port modelElement = (Port) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9869,17 +12185,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getParameter_3088OutgoingLinks(View view) {

 		Parameter modelElement = (Parameter) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9889,17 +12216,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getProperty_3070OutgoingLinks(View view) {

 		Property modelElement = (Property) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9909,17 +12247,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConnectableElement_3115OutgoingLinks(View view) {

 		ConnectableElement modelElement = (ConnectableElement) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9929,17 +12278,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCollaborationUse_3071OutgoingLinks(View view) {

 		CollaborationUse modelElement = (CollaborationUse) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9949,18 +12309,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActivity_3072OutgoingLinks(View view) {

 		Activity modelElement = (Activity) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9970,18 +12342,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteraction_3073OutgoingLinks(View view) {

 		Interaction modelElement = (Interaction) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -9991,18 +12375,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getProtocolStateMachine_3074OutgoingLinks(View view) {

 		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10012,18 +12408,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getStateMachine_3075OutgoingLinks(View view) {

 		StateMachine modelElement = (StateMachine) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10033,18 +12441,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getFunctionBehavior_3076OutgoingLinks(View view) {

 		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10054,18 +12474,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getOpaqueBehavior_3077OutgoingLinks(View view) {

 		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10075,18 +12507,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComponent_3081OutgoingLinks(View view) {

 		Component modelElement = (Component) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10096,18 +12540,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDevice_3082OutgoingLinks(View view) {

 		Device modelElement = (Device) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10117,18 +12573,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getExecutionEnvironment_3083OutgoingLinks(View view) {

 		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10138,18 +12606,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getNode_3084OutgoingLinks(View view) {

 		Node modelElement = (Node) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10159,18 +12639,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getClass_3085OutgoingLinks(View view) {

 		Class modelElement = (Class) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10180,18 +12672,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getCollaboration_3086OutgoingLinks(View view) {

 		Collaboration modelElement = (Collaboration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10201,18 +12705,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterface_3087OutgoingLinks(View view) {

 		Interface modelElement = (Interface) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10222,18 +12738,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getPrimitiveType_3078OutgoingLinks(View view) {

 		PrimitiveType modelElement = (PrimitiveType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10243,18 +12771,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getEnumeration_3079OutgoingLinks(View view) {

 		Enumeration modelElement = (Enumeration) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10264,18 +12804,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDataType_3080OutgoingLinks(View view) {

 		DataType modelElement = (DataType) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10285,18 +12837,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getActor_3091OutgoingLinks(View view) {

 		Actor modelElement = (Actor) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10306,18 +12870,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDeploymentSpecification_3092OutgoingLinks(View view) {

 		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10327,18 +12903,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getArtifact_3093OutgoingLinks(View view) {

 		Artifact modelElement = (Artifact) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10348,19 +12936,32 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInformationItem_3094OutgoingLinks(View view) {

 		InformationItem modelElement = (InformationItem) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10370,18 +12971,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSignal_3095OutgoingLinks(View view) {

 		Signal modelElement = (Signal) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10391,18 +13004,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getUseCase_3096OutgoingLinks(View view) {

 		UseCase modelElement = (UseCase) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10412,7 +13037,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComment_3097OutgoingLinks(View view) {

 		Comment modelElement = (Comment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002

+				(modelElement));

 		return result;

 	}

 

@@ -10422,18 +13048,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDurationConstraint_3116OutgoingLinks(View view) {

 		DurationConstraint modelElement = (DurationConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10443,18 +13081,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getTimeConstraint_3117OutgoingLinks(View view) {

 		TimeConstraint modelElement = (TimeConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10464,18 +13114,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getIntervalConstraint_3118OutgoingLinks(View view) {

 		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10485,18 +13147,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInteractionConstraint_3119OutgoingLinks(View view) {

 		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10506,18 +13180,30 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {

 		Constraint modelElement = (Constraint) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10548,17 +13234,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getComponentRealization_4004OutgoingLinks(View view) {

 		ComponentRealization modelElement = (ComponentRealization) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10568,17 +13265,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInterfaceRealization_4005OutgoingLinks(View view) {

 		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10588,17 +13296,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getSubstitution_4011OutgoingLinks(View view) {

 		Substitution modelElement = (Substitution) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10608,17 +13327,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getRealization_4006OutgoingLinks(View view) {

 		Realization modelElement = (Realization) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10628,17 +13358,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getManifestation_4012OutgoingLinks(View view) {

 		Manifestation modelElement = (Manifestation) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10648,17 +13389,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getAbstraction_4007OutgoingLinks(View view) {

 		Abstraction modelElement = (Abstraction) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10668,17 +13420,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getUsage_4008OutgoingLinks(View view) {

 		Usage modelElement = (Usage) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10688,17 +13451,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDeployment_4009OutgoingLinks(View view) {

 		Deployment modelElement = (Deployment) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10708,17 +13482,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDependency_4017OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10728,17 +13513,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getDependency_4010OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10748,17 +13544,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getConnector_4013OutgoingLinks(View view) {

 		Connector modelElement = (Connector) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10775,17 +13582,28 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	public List<UMLLinkDescriptor> getInformationFlow_4021OutgoingLinks(View view) {

 		InformationFlow modelElement = (InformationFlow) view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010

+				(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021

+				(modelElement));

 		return result;

 	}

 

@@ -10794,7 +13612,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_4004(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof ComponentRealization) {

 				continue;

@@ -10825,7 +13644,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_4005(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InterfaceRealization) {

 				continue;

@@ -10856,7 +13676,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_4011(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Substitution) {

 				continue;

@@ -10887,7 +13708,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_4006(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Realization) {

 				continue;

@@ -10918,7 +13740,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_4012(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -10949,7 +13772,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_4007(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Abstraction) {

 				continue;

@@ -10980,7 +13804,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_4008(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Usage) {

 				continue;

@@ -11011,7 +13836,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_4009(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -11042,7 +13868,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4017(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -11073,7 +13900,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4010(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -11104,7 +13932,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_4013(StructuredClassifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getOwnedConnectors()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Connector) {

 				continue;

@@ -11135,7 +13964,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4015(Classifier container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getGeneralizations()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -11156,7 +13986,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_4021(Package container) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InformationFlow) {

 				continue;

@@ -11552,7 +14383,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getAnnotatedElements()

+				.iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

 		}

@@ -11564,7 +14396,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getConstrainedElements()

+				.iterator(); destinations.hasNext();) {

 			Element destination = (Element) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

 		}

@@ -11588,7 +14421,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof ComponentRealization) {

 				continue;

@@ -11634,7 +14468,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InterfaceRealization) {

 				continue;

@@ -11680,7 +14515,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Substitution) {

 				continue;

@@ -11726,7 +14562,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Realization) {

 				continue;

@@ -11772,7 +14609,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Manifestation) {

 				continue;

@@ -11818,7 +14656,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Abstraction) {

 				continue;

@@ -11864,7 +14703,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Usage) {

 				continue;

@@ -11910,7 +14750,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Deployment) {

 				continue;

@@ -11956,7 +14797,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -12002,7 +14844,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Dependency) {

 				continue;

@@ -12048,7 +14891,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getGeneralizations()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof Generalization) {

 				continue;

@@ -12085,7 +14929,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(DurationObservation source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getEvents().iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getEvents()

+				.iterator(); destinations.hasNext();) {

 			NamedElement destination = (NamedElement) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));

 		}

@@ -12097,7 +14942,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 */

 	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(InformationItem source) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> destinations = source.getRepresenteds().iterator(); destinations.hasNext();) {

+		for (Iterator<?> destinations = source.getRepresenteds()

+				.iterator(); destinations.hasNext();) {

 			Classifier destination = (Classifier) destinations.next();

 			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));

 		}

@@ -12121,7 +14967,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 			return Collections.emptyList();

 		}

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

-		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+		for (Iterator<?> links = container.getPackagedElements()

+				.iterator(); links.hasNext();) {

 			EObject linkObject = (EObject) links.next();

 			if (false == linkObject instanceof InformationFlow) {

 				continue;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
index 275d8654af8..cb2b473af14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
@@ -77,11 +77,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected ElementInfo createElementInfo(Object element) throws CoreException {

 		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

 			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

+					NLS.bind(

+							Messages.UMLDocumentProvider_IncorrectInputError,

+							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

 					null));

 		}

 		IEditorInput editorInput = (IEditorInput) element;

 		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);

+

 		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);

 		info.setModificationStamp(computeModificationStamp(info));

 		info.fStatus = null;

@@ -95,7 +98,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	protected IDocument createDocument(Object element) throws CoreException {

 		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

 			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

+					NLS.bind(

+							Messages.UMLDocumentProvider_IncorrectInputError,

+							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

 					null));

 		}

 		IDocument document = createEmptyDocument();

@@ -184,7 +189,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			public void setTarget(Notifier newTarget) {

 				myTarger = newTarget;

 			}

+

 		});

+

 		return editingDomain;

 	}

 

@@ -240,13 +247,16 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					thrownExcp = (CoreException) e;

 				} else {

 					String msg = e.getLocalizedMessage();

-					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

+					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+							msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

 				}

 				throw thrownExcp;

 			}

 		} else {

 			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

-					NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

+					NLS.bind(

+							Messages.UMLDocumentProvider_IncorrectInputError,

+							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

 					null));

 		}

 	}

@@ -315,6 +325,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			}

 			ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);

 		}

+

 		super.doValidateState(element, computationContext);

 	}

 

@@ -495,6 +506,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		if (toCreateOrModify.exists()) {

 			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);

 		}

+

 		IResource parent = toCreateOrModify;

 		do {

 			/*

@@ -506,6 +518,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			toCreateOrModify = parent;

 			parent = toCreateOrModify.getParent();

 		} while (parent != null && !parent.exists());

+

 		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);

 	}

 

@@ -533,15 +546,20 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 		ResourceSetInfo info = getResourceSetInfo(element);

 		if (info != null) {

 			if (!overwrite && !info.isSynchronized()) {

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null));

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID,

+						IResourceStatus.OUT_OF_SYNC_LOCAL,

+						Messages.UMLDocumentProvider_UnsynchronizedFileSaveError,

+						null));

 			}

 			info.stopResourceListening();

 			fireElementStateChanging(element);

 			try {

-				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); // "Saving diagram"

+				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); //"Saving diagram"

 				for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

 					Resource nextResource = it.next();

-					monitor.setTaskName(NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI()));

+					monitor.setTaskName(NLS.bind(

+							Messages.UMLDocumentProvider_SaveNextResourceTask,

+							nextResource.getURI()));

 					if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {

 						try {

 							nextResource.save(UMLDiagramEditorUtil.getSaveOptions());

@@ -571,20 +589,22 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 				newResoruceURI = ((URIEditorInput) element).getURI();

 			} else {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[] { element,

-						"org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+						NLS.bind(

+								Messages.UMLDocumentProvider_IncorrectInputError,

+								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$

 						null));

 			}

 			if (false == document instanceof IDiagramDocument) {

 				fireElementStateChangeFailed(element);

-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,

+						"Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

 			}

 			IDiagramDocument diagramDocument = (IDiagramDocument) document;

 			final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);

 			final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram());

 			try {

 				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {

-

 					@Override

 					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 						newResource.getContents().add(diagramCopy);

@@ -617,6 +637,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 			}

 		}

 		changedResource.unload();

+

 		fireElementContentAboutToBeReplaced(info.getEditorInput());

 		removeUnchangedElementListeners(info.getEditorInput(), info);

 		info.fStatus = null;

@@ -892,7 +913,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					}

 				}

 				Display.getDefault().asyncExec(new Runnable() {

-

 					@Override

 					public void run() {

 						handleElementChanged(ResourceSetInfo.this, resource, null);

@@ -913,7 +933,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 					}

 				}

 				Display.getDefault().asyncExec(new Runnable() {

-

 					@Override

 					public void run() {

 						fireElementDeleted(ResourceSetInfo.this.getEditorInput());

@@ -935,7 +954,6 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 				}

 				if (myDocument.getDiagram().eResource() == resource) {

 					Display.getDefault().asyncExec(new Runnable() {

-

 						@Override

 						public void run() {

 							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);

@@ -1003,6 +1021,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 						}

 						if (dirtyStateChanged) {

 							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

+

 							if (!modified) {

 								myInfo.setModificationStamp(computeModificationStamp(myInfo));

 							}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
index cb825533aae..fad6de275bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
@@ -63,7 +63,8 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 		if (selection instanceof IStructuredSelection == false || selection.isEmpty()) {

 			return;

 		}

-		IFile file = (IFile) ((IStructuredSelection) selection).getFirstElement();

+		IFile file =

+				(IFile) ((IStructuredSelection) selection).getFirstElement();

 		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

 		action.setEnabled(true);

 	}

@@ -80,21 +81,27 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate {
 	 */

 	@Override

 	public void run(IAction action) {

-		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

+		TransactionalEditingDomain editingDomain =

+				WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();

 		ResourceSet resourceSet = editingDomain.getResourceSet();

 		EObject diagramRoot = null;

 		try {

 			Resource resource = resourceSet.getResource(domainModelURI, true);

 			diagramRoot = resource.getContents().get(0);

 		} catch (WrappedException ex) {

-			UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

 		}

 		if (diagramRoot == null) {

-			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage);

+			MessageDialog.openError(getShell(),

+					Messages.InitDiagramFile_ResourceErrorDialogTitle,

+					Messages.InitDiagramFile_ResourceErrorDialogMessage);

 			return;

 		}

 		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);

-		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, CompositeStructureDiagramEditPart.MODEL_ID));

+		wizard.setWindowTitle(NLS.bind(

+				Messages.InitDiagramFile_WizardTitle,

+				CompositeStructureDiagramEditPart.MODEL_ID));

 		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
index ad5fb7122a2..0b16a5d79e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
@@ -33,6 +33,7 @@ public class UMLMatchingStrategy implements IEditorMatchingStrategy {
 		} catch (PartInitException e) {

 			return false;

 		}

+

 		if (editorInput.equals(input)) {

 			return true;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
index ce4e2362839..365fa05c8e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
@@ -67,9 +67,13 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

 		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

 		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

-		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

+

+		myFileCreationPage = new WizardNewFileCreationPage

+				(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

 		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);

-		myFileCreationPage.setDescription(NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, CompositeStructureDiagramEditPart.MODEL_ID));

+		myFileCreationPage.setDescription(NLS.bind(

+				Messages.UMLNewDiagramFileWizard_CreationPageDescription,

+				CompositeStructureDiagramEditPart.MODEL_ID));

 		IPath filePath;

 		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

 		if (domainModelURI.isPlatformResource()) {

@@ -81,11 +85,14 @@ public class UMLNewDiagramFileWizard extends Wizard {
 			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

 		}

 		myFileCreationPage.setContainerFullPath(filePath);

-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "uml_csd")); //$NON-NLS-1$

+		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(

+				filePath, fileName, "uml_csd")); //$NON-NLS-1$

+

 		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

 		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

 		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

 		diagramRootElementSelectionPage.setModelElement(diagramRoot);

+

 		myEditingDomain = editingDomain;

 	}

 

@@ -110,28 +117,38 @@ public class UMLNewDiagramFileWizard extends Wizard {
 		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);

 		ResourceSet resourceSet = myEditingDomain.getResourceSet();

 		final Resource diagramResource = resourceSet.createResource(diagramModelURI);

-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

-				if (diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {

-					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

-				}

-				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

-				diagramResource.getContents().add(diagram);

-				new UMLDiagramContentInitializer().initDiagramContent(diagram);

-				return CommandResult.newOKCommandResult();

-			}

-		};

+		AbstractTransactionalCommand command =

+				new AbstractTransactionalCommand(

+						myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

+

+					@Override

+					protected CommandResult doExecuteWithResult(

+							IProgressMonitor monitor, IAdaptable info)

+							throws ExecutionException {

+						int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

+						if (diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {

+							return CommandResult.newErrorCommandResult(

+									Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+						}

+						Diagram diagram =

+								ViewService.createDiagram(

+										diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID,

+										UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+						diagramResource.getContents().add(diagram);

+						new UMLDiagramContentInitializer().initDiagramContent(diagram);

+						return CommandResult.newOKCommandResult();

+					}

+				};

 		try {

-			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);

+			OperationHistoryFactory.getOperationHistory().execute(

+					command, new NullProgressMonitor(), null);

 			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());

 			UMLDiagramEditorUtil.openDiagram(diagramResource);

 		} catch (ExecutionException e) {

 			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

 		} catch (IOException ex) {

-			UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

+			UMLDiagramEditorPlugin.getInstance().logError(

+					"Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

 		} catch (PartInitException ex) {

 			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$

 		}

@@ -167,7 +184,10 @@ public class UMLNewDiagramFileWizard extends Wizard {
 				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

 				return false;

 			}

-			boolean result = ViewService.getInstance().provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+			boolean result = ViewService.getInstance().provides(

+					new CreateDiagramViewOperation(

+							new EObjectAdapter(getModelElement()),

+							CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

 			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);

 			return result;

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
index 33e05d02712..aa135f5d85a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
@@ -178,6 +178,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	public UMLPaletteFactory() {

+

 	}

 

 	/**

@@ -281,6 +282,7 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 */

 	@Override

 	public Object getTemplate(String templateId) {

+

 		// default return: null

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
index c4263a3d666..61a420179ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
@@ -5765,6 +5765,7 @@ public class UMLVisualIDRegistry {
 				return false;

 			}

 		}

+

 		// General case : no restriction

 		return true;

 	}

@@ -5802,7 +5803,7 @@ public class UMLVisualIDRegistry {
 	 */

 	public static boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

 		if (candidate == -1) {

-			// unrecognized id is always bad

+			//unrecognized id is always bad

 			return false;

 		}

 		int basic = getNodeVisualID(containerView, domainElement);

@@ -5927,7 +5928,6 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

-

 		/**

 		 * @generated

 		 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
index 78b4d10e966..f389e5c3fd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
@@ -77,13 +77,16 @@ public class ValidateAction extends Action {
 		if (workbenchPart instanceof IDiagramWorkbenchPart) {

 			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;

 			try {

-				new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {

+				new WorkspaceModifyDelegatingOperation(

+						new IRunnableWithProgress() {

 

-					@Override

-					public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {

-						runValidation(part.getDiagramEditPart(), part.getDiagram());

-					}

-				}).run(new NullProgressMonitor());

+							@Override

+							public void run(IProgressMonitor monitor)

+									throws InterruptedException, InvocationTargetException {

+								runValidation(part.getDiagramEditPart(), part.getDiagram());

+							}

+						})

+						.run(new NullProgressMonitor());

 			} catch (Exception e) {

 				UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

 			}

@@ -96,9 +99,11 @@ public class ValidateAction extends Action {
 	public static void runValidation(View view) {

 		try {

 			if (UMLDiagramEditorUtil.openDiagram(view.eResource())) {

-				IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+				IEditorPart editorPart = PlatformUI.getWorkbench()

+						.getActiveWorkbenchWindow().getActivePage().getActiveEditor();

 				if (editorPart instanceof IDiagramWorkbenchPart) {

-					runValidation(((IDiagramWorkbenchPart) editorPart).getDiagramEditPart(), view);

+					runValidation(((IDiagramWorkbenchPart) editorPart).

+							getDiagramEditPart(), view);

 				} else {

 					runNonUIValidation(view);

 				}

@@ -116,7 +121,10 @@ public class ValidateAction extends Action {
 		if (shell == null) {

 			shell = new Shell();

 		}

-		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(view.getDiagram(), shell);

+

+		DiagramEditPart diagramEditPart =

+				OffscreenEditPartFactory.getInstance().createDiagramEditPart(

+						view.getDiagram(), shell);

 		runValidation(diagramEditPart, view);

 	}

 

@@ -156,13 +164,17 @@ public class ValidateAction extends Action {
 	 * @generated

 	 */

 	private static void validate(DiagramEditPart diagramEditPart, View view) {

-		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;

+		IFile target = view.eResource() != null ?

+				WorkspaceSynchronizer.getFile(view.eResource()) : null;

 		if (target != null) {

 			UMLMarkerNavigationProvider.deleteMarkers(target);

 		}

 		Diagnostic diagnostic = runEMFValidator(view);

 		createMarkers(target, diagnostic, diagramEditPart);

-		IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH);

+		IBatchValidator validator =

+				(IBatchValidator)

+				ModelValidationService.getInstance().newValidator(

+						EvaluationMode.BATCH);

 		validator.setIncludeLiveConstraints(true);

 		if (view.isSetElement() && view.getElement() != null) {

 			IStatus status = validator.validate(view.getElement());

@@ -173,37 +185,51 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

+	private static void createMarkers(IFile

+			target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

 		if (validationStatus.isOK()) {

 			return;

 		}

 		final IStatus rootStatus = validationStatus;

 		List allStatuses = new ArrayList();

-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(

+				diagramEditPart.getDiagramView(),

+				collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

 		for (Iterator it = allStatuses.iterator(); it.hasNext();) {

-			IConstraintStatus nextStatus = (IConstraintStatus) it.next();

-			View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap);

-			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), nextStatus.getSeverity());

+			IConstraintStatus nextStatus =

+					(IConstraintStatus) it.next();

+			View view = UMLDiagramEditorUtil.findView(

+					diagramEditPart, nextStatus.getTarget(), element2ViewMap);

+			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

+					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true),

+					nextStatus.getMessage(), nextStatus.getSeverity());

 		}

 	}

 

 	/**

 	 * @generated

 	 */

-	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

+	private static void createMarkers(IFile

+			target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

 		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {

 			return;

 		}

 		final Diagnostic rootStatus = emfValidationStatus;

 		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();

-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap =

+				new UMLDiagramEditorUtil.LazyElement2ViewMap(

+						diagramEditPart.getDiagramView(),

+						collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

 		for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {

 			Diagnostic nextDiagnostic = it.next();

 			List<?> data = nextDiagnostic.getData();

 			if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

 				EObject element = (EObject) data.get(0);

-				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);

-				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+				View view = UMLDiagramEditorUtil.findView(

+						diagramEditPart, element, element2ViewMap);

+				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),

+						EMFCoreUtil.getQualifiedName(element, true),

+						nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

 			}

 		}

 	}

@@ -211,11 +237,13 @@ public class ValidateAction extends Action {
 	/**

 	 * @generated

 	 */

-	private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, String message, int statusSeverity) {

+	private static void addMarker(EditPartViewer viewer, IFile

+			target, String elementId, String location, String message, int statusSeverity) {

 		if (target == null) {

 			return;

 		}

-		UMLMarkerNavigationProvider.addMarker(target, elementId, location, message, statusSeverity);

+		UMLMarkerNavigationProvider.addMarker(

+				target, elementId, location, message, statusSeverity);

 	}

 

 	/**

@@ -228,7 +256,8 @@ public class ValidateAction extends Action {
 			return IStatus.INFO;

 		} else if (diagnosticSeverity == Diagnostic.WARNING) {

 			return IStatus.WARNING;

-		} else if (diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) {

+		} else if (diagnosticSeverity == Diagnostic.ERROR

+				|| diagnosticSeverity == Diagnostic.CANCEL) {

 			return IStatus.ERROR;

 		}

 		return IStatus.INFO;

@@ -264,7 +293,8 @@ public class ValidateAction extends Action {
 		}

 		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {

 			for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {

-				collectTargetElements(it.next(), targetElementCollector, allDiagnostics);

+				collectTargetElements(it.next(),

+						targetElementCollector, allDiagnostics);

 			}

 		}

 		return targetElementCollector;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
index b2233927f0d..c0e72ad7994 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
@@ -36,6 +36,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
 		ConnectionsPreferencePage.initDefaults(store);

 		PrintingPreferencePage.initDefaults(store);

 		RulerGridPreferencePage.initDefaults(store);

+

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
index a8223970c90..66fefff119d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
@@ -1,2290 +1,2508 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.AnyReceiveEvent;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.CallEvent;
-import org.eclipse.uml2.uml.ChangeEvent;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.DeploymentSpecification;
-import org.eclipse.uml2.uml.Device;
-import org.eclipse.uml2.uml.Duration;
-import org.eclipse.uml2.uml.DurationConstraint;
-import org.eclipse.uml2.uml.DurationInterval;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.ExecutionEnvironment;
-import org.eclipse.uml2.uml.Expression;
-import org.eclipse.uml2.uml.FunctionBehavior;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.InteractionConstraint;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Interval;
-import org.eclipse.uml2.uml.IntervalConstraint;
-import org.eclipse.uml2.uml.LiteralBoolean;
-import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.LiteralNull;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.ProtocolStateMachine;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.SignalEvent;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.StringExpression;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.TimeConstraint;
-import org.eclipse.uml2.uml.TimeEvent;
-import org.eclipse.uml2.uml.TimeExpression;
-import org.eclipse.uml2.uml.TimeInterval;
-import org.eclipse.uml2.uml.TimeObservation;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.Usage;
-import org.eclipse.uml2.uml.UseCase;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * @generated
- */
-public class ElementInitializers {
-
-	protected ElementInitializers() {
-		// use #getInstance to access cached instance
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Activity_2060(Activity instance) {
-		try {
-			Object value_0 = name_Activity_2060(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interaction_2061(Interaction instance) {
-		try {
-			Object value_0 = name_Interaction_2061(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ProtocolStateMachine_2062(ProtocolStateMachine instance) {
-		try {
-			Object value_0 = name_ProtocolStateMachine_2062(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StateMachine_2063(StateMachine instance) {
-		try {
-			Object value_0 = name_StateMachine_2063(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_FunctionBehavior_2064(FunctionBehavior instance) {
-		try {
-			Object value_0 = name_FunctionBehavior_2064(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueBehavior_2065(OpaqueBehavior instance) {
-		try {
-			Object value_0 = name_OpaqueBehavior_2065(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_2069(Component instance) {
-		try {
-			Object value_0 = name_Component_2069(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Device_2070(Device instance) {
-		try {
-			Object value_0 = name_Device_2070(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ExecutionEnvironment_2071(ExecutionEnvironment instance) {
-		try {
-			Object value_0 = name_ExecutionEnvironment_2071(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Node_2072(Node instance) {
-		try {
-			Object value_0 = name_Node_2072(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Class_2073(Class instance) {
-		try {
-			Object value_0 = name_Class_2073(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Collaboration_2075(Collaboration instance) {
-		try {
-			Object value_0 = name_Collaboration_2075(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_2076(Interface instance) {
-		try {
-			Object value_0 = name_Interface_2076(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_PrimitiveType_2066(PrimitiveType instance) {
-		try {
-			Object value_0 = name_PrimitiveType_2066(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Enumeration_2067(Enumeration instance) {
-		try {
-			Object value_0 = name_Enumeration_2067(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DataType_2068(DataType instance) {
-		try {
-			Object value_0 = name_DataType_2068(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Actor_2077(Actor instance) {
-		try {
-			Object value_0 = name_Actor_2077(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DeploymentSpecification_2078(DeploymentSpecification instance) {
-		try {
-			Object value_0 = name_DeploymentSpecification_2078(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Artifact_2079(Artifact instance) {
-		try {
-			Object value_0 = name_Artifact_2079(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationItem_2080(InformationItem instance) {
-		try {
-			Object value_0 = name_InformationItem_2080(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = isAbstract_InformationItem_2080(instance);
-			if (value_1 != null) {
-				instance.setIsAbstract(((Boolean) value_1).booleanValue());
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Signal_2081(Signal instance) {
-		try {
-			Object value_0 = name_Signal_2081(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_UseCase_2082(UseCase instance) {
-		try {
-			Object value_0 = name_UseCase_2082(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_SignalEvent_2083(SignalEvent instance) {
-		try {
-			Object value_0 = name_SignalEvent_2083(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_CallEvent_2084(CallEvent instance) {
-		try {
-			Object value_0 = name_CallEvent_2084(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_AnyReceiveEvent_2085(AnyReceiveEvent instance) {
-		try {
-			Object value_0 = name_AnyReceiveEvent_2085(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ChangeEvent_2088(ChangeEvent instance) {
-		try {
-			Object value_0 = name_ChangeEvent_2088(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeEvent_2089(TimeEvent instance) {
-		try {
-			Object value_0 = name_TimeEvent_2089(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationObservation_2093(DurationObservation instance) {
-		try {
-			Object value_0 = name_DurationObservation_2093(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeObservation_2094(TimeObservation instance) {
-		try {
-			Object value_0 = name_TimeObservation_2094(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralBoolean_2095(LiteralBoolean instance) {
-		try {
-			Object value_0 = name_LiteralBoolean_2095(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralInteger_2096(LiteralInteger instance) {
-		try {
-			Object value_0 = name_LiteralInteger_2096(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralNull_2097(LiteralNull instance) {
-		try {
-			Object value_0 = name_LiteralNull_2097(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralString_2098(LiteralString instance) {
-		try {
-			Object value_0 = name_LiteralString_2098(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural instance) {
-		try {
-			Object value_0 = name_LiteralUnlimitedNatural_2099(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StringExpression_2100(StringExpression instance) {
-		try {
-			Object value_0 = name_StringExpression_2100(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueExpression_2101(OpaqueExpression instance) {
-		try {
-			Object value_0 = name_OpaqueExpression_2101(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeExpression_2102(TimeExpression instance) {
-		try {
-			Object value_0 = name_TimeExpression_2102(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Expression_2103(Expression instance) {
-		try {
-			Object value_0 = name_Expression_2103(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Duration_2104(Duration instance) {
-		try {
-			Object value_0 = name_Duration_2104(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeInterval_2105(TimeInterval instance) {
-		try {
-			Object value_0 = name_TimeInterval_2105(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationInterval_2106(DurationInterval instance) {
-		try {
-			Object value_0 = name_DurationInterval_2106(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interval_2107(Interval instance) {
-		try {
-			Object value_0 = name_Interval_2107(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InstanceValue_2108(InstanceValue instance) {
-		try {
-			Object value_0 = name_InstanceValue_2108(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_2109(Comment instance) {
-		try {
-			Object value_0 = body_Comment_2109(instance);
-			if (value_0 != null) {
-				instance.setBody((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationConstraint_2110(DurationConstraint instance) {
-		try {
-			Object value_0 = name_DurationConstraint_2110(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_DurationConstraint_2110(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeConstraint_2111(TimeConstraint instance) {
-		try {
-			Object value_0 = name_TimeConstraint_2111(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_TimeConstraint_2111(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_IntervalConstraint_2112(IntervalConstraint instance) {
-		try {
-			Object value_0 = name_IntervalConstraint_2112(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_IntervalConstraint_2112(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InteractionConstraint_2113(InteractionConstraint instance) {
-		try {
-			Object value_0 = name_InteractionConstraint_2113(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_InteractionConstraint_2113(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_2114(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_2114(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_Constraint_2114(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Port_3069(Port instance) {
-		try {
-			Object value_0 = name_Port_3069(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);
-
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Parameter_3088(Parameter instance) {
-		try {
-			Object value_0 = name_Parameter_3088(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_3070(Property instance) {
-		try {
-			Object value_0 = name_Property_3070(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ConnectableElement_3115(ConnectableElement instance) {
-		try {
-			Object value_0 = name_ConnectableElement_3115(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_CollaborationUse_3071(CollaborationUse instance) {
-		try {
-			Object value_0 = name_CollaborationUse_3071(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Activity_3072(Activity instance) {
-		try {
-			Object value_0 = name_Activity_3072(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interaction_3073(Interaction instance) {
-		try {
-			Object value_0 = name_Interaction_3073(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ProtocolStateMachine_3074(ProtocolStateMachine instance) {
-		try {
-			Object value_0 = name_ProtocolStateMachine_3074(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StateMachine_3075(StateMachine instance) {
-		try {
-			Object value_0 = name_StateMachine_3075(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_FunctionBehavior_3076(FunctionBehavior instance) {
-		try {
-			Object value_0 = name_FunctionBehavior_3076(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueBehavior_3077(OpaqueBehavior instance) {
-		try {
-			Object value_0 = name_OpaqueBehavior_3077(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_3081(Component instance) {
-		try {
-			Object value_0 = name_Component_3081(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Device_3082(Device instance) {
-		try {
-			Object value_0 = name_Device_3082(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ExecutionEnvironment_3083(ExecutionEnvironment instance) {
-		try {
-			Object value_0 = name_ExecutionEnvironment_3083(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Node_3084(Node instance) {
-		try {
-			Object value_0 = name_Node_3084(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Class_3085(Class instance) {
-		try {
-			Object value_0 = name_Class_3085(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Collaboration_3086(Collaboration instance) {
-		try {
-			Object value_0 = name_Collaboration_3086(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_3087(Interface instance) {
-		try {
-			Object value_0 = name_Interface_3087(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_PrimitiveType_3078(PrimitiveType instance) {
-		try {
-			Object value_0 = name_PrimitiveType_3078(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Enumeration_3079(Enumeration instance) {
-		try {
-			Object value_0 = name_Enumeration_3079(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DataType_3080(DataType instance) {
-		try {
-			Object value_0 = name_DataType_3080(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Actor_3091(Actor instance) {
-		try {
-			Object value_0 = name_Actor_3091(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DeploymentSpecification_3092(DeploymentSpecification instance) {
-		try {
-			Object value_0 = name_DeploymentSpecification_3092(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Artifact_3093(Artifact instance) {
-		try {
-			Object value_0 = name_Artifact_3093(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationItem_3094(InformationItem instance) {
-		try {
-			Object value_0 = name_InformationItem_3094(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = isAbstract_InformationItem_3094(instance);
-			if (value_1 != null) {
-				instance.setIsAbstract(((Boolean) value_1).booleanValue());
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Signal_3095(Signal instance) {
-		try {
-			Object value_0 = name_Signal_3095(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_UseCase_3096(UseCase instance) {
-		try {
-			Object value_0 = name_UseCase_3096(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_3097(Comment instance) {
-		try {
-			Object value_0 = body_Comment_3097(instance);
-			if (value_0 != null) {
-				instance.setBody((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationConstraint_3116(DurationConstraint instance) {
-		try {
-			Object value_0 = name_DurationConstraint_3116(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_DurationConstraint_3116(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeConstraint_3117(TimeConstraint instance) {
-		try {
-			Object value_0 = name_TimeConstraint_3117(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_TimeConstraint_3117(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_IntervalConstraint_3118(IntervalConstraint instance) {
-		try {
-			Object value_0 = name_IntervalConstraint_3118(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_IntervalConstraint_3118(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InteractionConstraint_3119(InteractionConstraint instance) {
-		try {
-			Object value_0 = name_InteractionConstraint_3119(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_InteractionConstraint_3119(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_3120(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_3120(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-			Object value_1 = specification_Constraint_3120(instance);
-			if (value_1 != null) {
-				instance.setSpecification((ValueSpecification) value_1);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_3101(Property instance) {
-		try {
-			Object value_0 = name_Property_3101(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Operation_3102(Operation instance) {
-		try {
-			Object value_0 = name_Operation_3102(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_EnumerationLiteral_3066(EnumerationLiteral instance) {
-		try {
-			Object value_0 = name_EnumerationLiteral_3066(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ComponentRealization_4004(ComponentRealization instance) {
-		try {
-			Object value_0 = name_ComponentRealization_4004(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InterfaceRealization_4005(InterfaceRealization instance) {
-		try {
-			Object value_0 = name_InterfaceRealization_4005(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Substitution_4011(Substitution instance) {
-		try {
-			Object value_0 = name_Substitution_4011(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Realization_4006(Realization instance) {
-		try {
-			Object value_0 = name_Realization_4006(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Manifestation_4012(Manifestation instance) {
-		try {
-			Object value_0 = name_Manifestation_4012(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Abstraction_4007(Abstraction instance) {
-		try {
-			Object value_0 = name_Abstraction_4007(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Usage_4008(Usage instance) {
-		try {
-			Object value_0 = name_Usage_4008(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Deployment_4009(Deployment instance) {
-		try {
-			Object value_0 = name_Deployment_4009(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Dependency_4010(Dependency instance) {
-		try {
-			Object value_0 = name_Dependency_4010(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Connector_4013(Connector instance) {
-		try {
-			Object value_0 = name_Connector_4013(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationFlow_4021(InformationFlow instance) {
-		try {
-			Object value_0 = name_InformationFlow_4021(instance);
-			if (value_0 != null) {
-				instance.setName((String) value_0);
-			}
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Activity_2060(Activity it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interaction_2061(Interaction it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ProtocolStateMachine_2062(ProtocolStateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StateMachine_2063(StateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_FunctionBehavior_2064(FunctionBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueBehavior_2065(OpaqueBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Component_2069(Component it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Device_2070(Device it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ExecutionEnvironment_2071(ExecutionEnvironment it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Node_2072(Node it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Class_2073(Class it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Collaboration_2075(Collaboration it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_2076(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_PrimitiveType_2066(PrimitiveType it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Enumeration_2067(Enumeration it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DataType_2068(DataType it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Actor_2077(Actor it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DeploymentSpecification_2078(DeploymentSpecification it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Artifact_2079(Artifact it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationItem_2080(InformationItem it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private Boolean isAbstract_InformationItem_2080(InformationItem it) {
-		// InformationItem is Abstract
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Signal_2081(Signal it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_UseCase_2082(UseCase it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_SignalEvent_2083(SignalEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_CallEvent_2084(CallEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_AnyReceiveEvent_2085(AnyReceiveEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ChangeEvent_2088(ChangeEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeEvent_2089(TimeEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationObservation_2093(DurationObservation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeObservation_2094(TimeObservation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralBoolean_2095(LiteralBoolean it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralInteger_2096(LiteralInteger it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralNull_2097(LiteralNull it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralString_2098(LiteralString it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StringExpression_2100(StringExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueExpression_2101(OpaqueExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeExpression_2102(TimeExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Expression_2103(Expression it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Duration_2104(Duration it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeInterval_2105(TimeInterval it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationInterval_2106(DurationInterval it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interval_2107(Interval it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InstanceValue_2108(InstanceValue it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_2109(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationConstraint_2110(DurationConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_DurationConstraint_2110(DurationConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeConstraint_2111(TimeConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_TimeConstraint_2111(TimeConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_IntervalConstraint_2112(IntervalConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_IntervalConstraint_2112(IntervalConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InteractionConstraint_2113(InteractionConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_InteractionConstraint_2113(InteractionConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_2114(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_2114(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Port_3069(Port it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Parameter_3088(Parameter it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_3070(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ConnectableElement_3115(ConnectableElement it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_CollaborationUse_3071(CollaborationUse it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Activity_3072(Activity it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interaction_3073(Interaction it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ProtocolStateMachine_3074(ProtocolStateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StateMachine_3075(StateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_FunctionBehavior_3076(FunctionBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueBehavior_3077(OpaqueBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Component_3081(Component it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Device_3082(Device it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ExecutionEnvironment_3083(ExecutionEnvironment it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Node_3084(Node it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Class_3085(Class it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Collaboration_3086(Collaboration it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_3087(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_PrimitiveType_3078(PrimitiveType it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Enumeration_3079(Enumeration it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DataType_3080(DataType it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Actor_3091(Actor it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DeploymentSpecification_3092(DeploymentSpecification it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Artifact_3093(Artifact it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationItem_3094(InformationItem it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private Boolean isAbstract_InformationItem_3094(InformationItem it) {
-		// InformationItem is Abstract
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Signal_3095(Signal it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_UseCase_3096(UseCase it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_3097(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationConstraint_3116(DurationConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_DurationConstraint_3116(DurationConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeConstraint_3117(TimeConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_TimeConstraint_3117(TimeConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_IntervalConstraint_3118(IntervalConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_IntervalConstraint_3118(IntervalConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InteractionConstraint_3119(InteractionConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_InteractionConstraint_3119(InteractionConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_3120(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_3120(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_3101(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Operation_3102(Operation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_EnumerationLiteral_3066(EnumerationLiteral it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ComponentRealization_4004(ComponentRealization it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InterfaceRealization_4005(InterfaceRealization it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Substitution_4011(Substitution it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Realization_4006(Realization it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Manifestation_4012(Manifestation it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Abstraction_4007(Abstraction it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Usage_4008(Usage it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Deployment_4009(Deployment it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Dependency_4010(Dependency it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Connector_4013(Connector it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationFlow_4021(InformationFlow it) {
-		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ElementInitializers getInstance() {
-		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();
-		if (cached == null) {
-			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());
-		}
-		return cached;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.AggregationKind;

+import org.eclipse.uml2.uml.AnyReceiveEvent;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.CallEvent;

+import org.eclipse.uml2.uml.ChangeEvent;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.DeploymentSpecification;

+import org.eclipse.uml2.uml.Device;

+import org.eclipse.uml2.uml.Duration;

+import org.eclipse.uml2.uml.DurationConstraint;

+import org.eclipse.uml2.uml.DurationInterval;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

+import org.eclipse.uml2.uml.ExecutionEnvironment;

+import org.eclipse.uml2.uml.Expression;

+import org.eclipse.uml2.uml.FunctionBehavior;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.InstanceValue;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.InteractionConstraint;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Interval;

+import org.eclipse.uml2.uml.IntervalConstraint;

+import org.eclipse.uml2.uml.LiteralBoolean;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.LiteralNull;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.OpaqueBehavior;

+import org.eclipse.uml2.uml.OpaqueExpression;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Parameter;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.ProtocolStateMachine;

+import org.eclipse.uml2.uml.Realization;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.SignalEvent;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.StringExpression;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.TimeConstraint;

+import org.eclipse.uml2.uml.TimeEvent;

+import org.eclipse.uml2.uml.TimeExpression;

+import org.eclipse.uml2.uml.TimeInterval;

+import org.eclipse.uml2.uml.TimeObservation;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.Usage;

+import org.eclipse.uml2.uml.UseCase;

+import org.eclipse.uml2.uml.ValueSpecification;

+

+/**

+ * @generated

+ */

+public class ElementInitializers {

+

+	protected ElementInitializers() {

+		// use #getInstance to access cached instance

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Activity_2060(Activity instance) {

+		try {

+			Object value_0 = name_Activity_2060(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interaction_2061(Interaction instance) {

+		try {

+			Object value_0 = name_Interaction_2061(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ProtocolStateMachine_2062(ProtocolStateMachine instance) {

+		try {

+			Object value_0 = name_ProtocolStateMachine_2062(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StateMachine_2063(StateMachine instance) {

+		try {

+			Object value_0 = name_StateMachine_2063(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_FunctionBehavior_2064(FunctionBehavior instance) {

+		try {

+			Object value_0 = name_FunctionBehavior_2064(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueBehavior_2065(OpaqueBehavior instance) {

+		try {

+			Object value_0 = name_OpaqueBehavior_2065(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_2069(Component instance) {

+		try {

+			Object value_0 = name_Component_2069(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Device_2070(Device instance) {

+		try {

+			Object value_0 = name_Device_2070(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ExecutionEnvironment_2071(ExecutionEnvironment instance) {

+		try {

+			Object value_0 = name_ExecutionEnvironment_2071(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Node_2072(Node instance) {

+		try {

+			Object value_0 = name_Node_2072(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Class_2073(Class instance) {

+		try {

+			Object value_0 = name_Class_2073(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Collaboration_2075(Collaboration instance) {

+		try {

+			Object value_0 = name_Collaboration_2075(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_2076(Interface instance) {

+		try {

+			Object value_0 = name_Interface_2076(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_PrimitiveType_2066(PrimitiveType instance) {

+		try {

+			Object value_0 = name_PrimitiveType_2066(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Enumeration_2067(Enumeration instance) {

+		try {

+			Object value_0 = name_Enumeration_2067(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DataType_2068(DataType instance) {

+		try {

+			Object value_0 = name_DataType_2068(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Actor_2077(Actor instance) {

+		try {

+			Object value_0 = name_Actor_2077(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DeploymentSpecification_2078(DeploymentSpecification instance) {

+		try {

+			Object value_0 = name_DeploymentSpecification_2078(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Artifact_2079(Artifact instance) {

+		try {

+			Object value_0 = name_Artifact_2079(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationItem_2080(InformationItem instance) {

+		try {

+			Object value_0 = name_InformationItem_2080(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = isAbstract_InformationItem_2080(instance);

+			if (value_1 != null) {

+				instance.setIsAbstract(

+						((Boolean) value_1).booleanValue()

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Signal_2081(Signal instance) {

+		try {

+			Object value_0 = name_Signal_2081(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_UseCase_2082(UseCase instance) {

+		try {

+			Object value_0 = name_UseCase_2082(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_SignalEvent_2083(SignalEvent instance) {

+		try {

+			Object value_0 = name_SignalEvent_2083(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_CallEvent_2084(CallEvent instance) {

+		try {

+			Object value_0 = name_CallEvent_2084(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_AnyReceiveEvent_2085(AnyReceiveEvent instance) {

+		try {

+			Object value_0 = name_AnyReceiveEvent_2085(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ChangeEvent_2088(ChangeEvent instance) {

+		try {

+			Object value_0 = name_ChangeEvent_2088(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeEvent_2089(TimeEvent instance) {

+		try {

+			Object value_0 = name_TimeEvent_2089(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationObservation_2093(DurationObservation instance) {

+		try {

+			Object value_0 = name_DurationObservation_2093(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeObservation_2094(TimeObservation instance) {

+		try {

+			Object value_0 = name_TimeObservation_2094(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralBoolean_2095(LiteralBoolean instance) {

+		try {

+			Object value_0 = name_LiteralBoolean_2095(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralInteger_2096(LiteralInteger instance) {

+		try {

+			Object value_0 = name_LiteralInteger_2096(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralNull_2097(LiteralNull instance) {

+		try {

+			Object value_0 = name_LiteralNull_2097(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralString_2098(LiteralString instance) {

+		try {

+			Object value_0 = name_LiteralString_2098(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural instance) {

+		try {

+			Object value_0 = name_LiteralUnlimitedNatural_2099(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StringExpression_2100(StringExpression instance) {

+		try {

+			Object value_0 = name_StringExpression_2100(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueExpression_2101(OpaqueExpression instance) {

+		try {

+			Object value_0 = name_OpaqueExpression_2101(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeExpression_2102(TimeExpression instance) {

+		try {

+			Object value_0 = name_TimeExpression_2102(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Expression_2103(Expression instance) {

+		try {

+			Object value_0 = name_Expression_2103(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Duration_2104(Duration instance) {

+		try {

+			Object value_0 = name_Duration_2104(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeInterval_2105(TimeInterval instance) {

+		try {

+			Object value_0 = name_TimeInterval_2105(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationInterval_2106(DurationInterval instance) {

+		try {

+			Object value_0 = name_DurationInterval_2106(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interval_2107(Interval instance) {

+		try {

+			Object value_0 = name_Interval_2107(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InstanceValue_2108(InstanceValue instance) {

+		try {

+			Object value_0 = name_InstanceValue_2108(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_2109(Comment instance) {

+		try {

+			Object value_0 = body_Comment_2109(instance);

+			if (value_0 != null) {

+				instance.setBody(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationConstraint_2110(DurationConstraint instance) {

+		try {

+			Object value_0 = name_DurationConstraint_2110(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_DurationConstraint_2110(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeConstraint_2111(TimeConstraint instance) {

+		try {

+			Object value_0 = name_TimeConstraint_2111(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_TimeConstraint_2111(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_IntervalConstraint_2112(IntervalConstraint instance) {

+		try {

+			Object value_0 = name_IntervalConstraint_2112(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_IntervalConstraint_2112(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InteractionConstraint_2113(InteractionConstraint instance) {

+		try {

+			Object value_0 = name_InteractionConstraint_2113(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_InteractionConstraint_2113(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_2114(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_2114(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_Constraint_2114(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Port_3069(Port instance) {

+		try {

+			Object value_0 = name_Port_3069(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			instance.setAggregation(

+					AggregationKind.COMPOSITE_LITERAL

+					);

+

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Parameter_3088(Parameter instance) {

+		try {

+			Object value_0 = name_Parameter_3088(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_3070(Property instance) {

+		try {

+			Object value_0 = name_Property_3070(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ConnectableElement_3115(ConnectableElement instance) {

+		try {

+			Object value_0 = name_ConnectableElement_3115(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_CollaborationUse_3071(CollaborationUse instance) {

+		try {

+			Object value_0 = name_CollaborationUse_3071(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Activity_3072(Activity instance) {

+		try {

+			Object value_0 = name_Activity_3072(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interaction_3073(Interaction instance) {

+		try {

+			Object value_0 = name_Interaction_3073(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ProtocolStateMachine_3074(ProtocolStateMachine instance) {

+		try {

+			Object value_0 = name_ProtocolStateMachine_3074(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StateMachine_3075(StateMachine instance) {

+		try {

+			Object value_0 = name_StateMachine_3075(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_FunctionBehavior_3076(FunctionBehavior instance) {

+		try {

+			Object value_0 = name_FunctionBehavior_3076(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueBehavior_3077(OpaqueBehavior instance) {

+		try {

+			Object value_0 = name_OpaqueBehavior_3077(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_3081(Component instance) {

+		try {

+			Object value_0 = name_Component_3081(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Device_3082(Device instance) {

+		try {

+			Object value_0 = name_Device_3082(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ExecutionEnvironment_3083(ExecutionEnvironment instance) {

+		try {

+			Object value_0 = name_ExecutionEnvironment_3083(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Node_3084(Node instance) {

+		try {

+			Object value_0 = name_Node_3084(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Class_3085(Class instance) {

+		try {

+			Object value_0 = name_Class_3085(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Collaboration_3086(Collaboration instance) {

+		try {

+			Object value_0 = name_Collaboration_3086(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_3087(Interface instance) {

+		try {

+			Object value_0 = name_Interface_3087(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_PrimitiveType_3078(PrimitiveType instance) {

+		try {

+			Object value_0 = name_PrimitiveType_3078(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Enumeration_3079(Enumeration instance) {

+		try {

+			Object value_0 = name_Enumeration_3079(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DataType_3080(DataType instance) {

+		try {

+			Object value_0 = name_DataType_3080(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Actor_3091(Actor instance) {

+		try {

+			Object value_0 = name_Actor_3091(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DeploymentSpecification_3092(DeploymentSpecification instance) {

+		try {

+			Object value_0 = name_DeploymentSpecification_3092(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Artifact_3093(Artifact instance) {

+		try {

+			Object value_0 = name_Artifact_3093(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationItem_3094(InformationItem instance) {

+		try {

+			Object value_0 = name_InformationItem_3094(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = isAbstract_InformationItem_3094(instance);

+			if (value_1 != null) {

+				instance.setIsAbstract(

+						((Boolean) value_1).booleanValue()

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Signal_3095(Signal instance) {

+		try {

+			Object value_0 = name_Signal_3095(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_UseCase_3096(UseCase instance) {

+		try {

+			Object value_0 = name_UseCase_3096(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_3097(Comment instance) {

+		try {

+			Object value_0 = body_Comment_3097(instance);

+			if (value_0 != null) {

+				instance.setBody(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationConstraint_3116(DurationConstraint instance) {

+		try {

+			Object value_0 = name_DurationConstraint_3116(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_DurationConstraint_3116(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeConstraint_3117(TimeConstraint instance) {

+		try {

+			Object value_0 = name_TimeConstraint_3117(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_TimeConstraint_3117(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_IntervalConstraint_3118(IntervalConstraint instance) {

+		try {

+			Object value_0 = name_IntervalConstraint_3118(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_IntervalConstraint_3118(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InteractionConstraint_3119(InteractionConstraint instance) {

+		try {

+			Object value_0 = name_InteractionConstraint_3119(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_InteractionConstraint_3119(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_3120(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_3120(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+			Object value_1 = specification_Constraint_3120(instance);

+			if (value_1 != null) {

+				instance.setSpecification(

+						(ValueSpecification) value_1

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_3101(Property instance) {

+		try {

+			Object value_0 = name_Property_3101(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Operation_3102(Operation instance) {

+		try {

+			Object value_0 = name_Operation_3102(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_EnumerationLiteral_3066(EnumerationLiteral instance) {

+		try {

+			Object value_0 = name_EnumerationLiteral_3066(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ComponentRealization_4004(ComponentRealization instance) {

+		try {

+			Object value_0 = name_ComponentRealization_4004(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InterfaceRealization_4005(InterfaceRealization instance) {

+		try {

+			Object value_0 = name_InterfaceRealization_4005(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Substitution_4011(Substitution instance) {

+		try {

+			Object value_0 = name_Substitution_4011(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Realization_4006(Realization instance) {

+		try {

+			Object value_0 = name_Realization_4006(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Manifestation_4012(Manifestation instance) {

+		try {

+			Object value_0 = name_Manifestation_4012(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Abstraction_4007(Abstraction instance) {

+		try {

+			Object value_0 = name_Abstraction_4007(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Usage_4008(Usage instance) {

+		try {

+			Object value_0 = name_Usage_4008(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Deployment_4009(Deployment instance) {

+		try {

+			Object value_0 = name_Deployment_4009(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Dependency_4010(Dependency instance) {

+		try {

+			Object value_0 = name_Dependency_4010(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Connector_4013(Connector instance) {

+		try {

+			Object value_0 = name_Connector_4013(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationFlow_4021(InformationFlow instance) {

+		try {

+			Object value_0 = name_InformationFlow_4021(instance);

+			if (value_0 != null) {

+				instance.setName(

+						(String) value_0

+						);

+			}

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Activity_2060(Activity it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interaction_2061(Interaction it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ProtocolStateMachine_2062(ProtocolStateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StateMachine_2063(StateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_FunctionBehavior_2064(FunctionBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueBehavior_2065(OpaqueBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Component_2069(Component it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Device_2070(Device it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ExecutionEnvironment_2071(ExecutionEnvironment it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Node_2072(Node it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Class_2073(Class it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Collaboration_2075(Collaboration it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_2076(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_PrimitiveType_2066(PrimitiveType it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Enumeration_2067(Enumeration it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DataType_2068(DataType it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Actor_2077(Actor it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DeploymentSpecification_2078(DeploymentSpecification it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Artifact_2079(Artifact it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationItem_2080(InformationItem it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private Boolean isAbstract_InformationItem_2080(InformationItem it) {

+		// InformationItem is Abstract

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Signal_2081(Signal it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_UseCase_2082(UseCase it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_SignalEvent_2083(SignalEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_CallEvent_2084(CallEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_AnyReceiveEvent_2085(AnyReceiveEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ChangeEvent_2088(ChangeEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeEvent_2089(TimeEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationObservation_2093(DurationObservation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeObservation_2094(TimeObservation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralBoolean_2095(LiteralBoolean it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralInteger_2096(LiteralInteger it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralNull_2097(LiteralNull it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralString_2098(LiteralString it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StringExpression_2100(StringExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueExpression_2101(OpaqueExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeExpression_2102(TimeExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Expression_2103(Expression it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Duration_2104(Duration it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeInterval_2105(TimeInterval it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationInterval_2106(DurationInterval it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interval_2107(Interval it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InstanceValue_2108(InstanceValue it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_2109(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationConstraint_2110(DurationConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_DurationConstraint_2110(DurationConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeConstraint_2111(TimeConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_TimeConstraint_2111(TimeConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_IntervalConstraint_2112(IntervalConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_IntervalConstraint_2112(IntervalConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InteractionConstraint_2113(InteractionConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_InteractionConstraint_2113(InteractionConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_2114(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_2114(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Port_3069(Port it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Parameter_3088(Parameter it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_3070(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ConnectableElement_3115(ConnectableElement it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_CollaborationUse_3071(CollaborationUse it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Activity_3072(Activity it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interaction_3073(Interaction it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ProtocolStateMachine_3074(ProtocolStateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StateMachine_3075(StateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_FunctionBehavior_3076(FunctionBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueBehavior_3077(OpaqueBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Component_3081(Component it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Device_3082(Device it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ExecutionEnvironment_3083(ExecutionEnvironment it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Node_3084(Node it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Class_3085(Class it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Collaboration_3086(Collaboration it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_3087(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_PrimitiveType_3078(PrimitiveType it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Enumeration_3079(Enumeration it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DataType_3080(DataType it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Actor_3091(Actor it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DeploymentSpecification_3092(DeploymentSpecification it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Artifact_3093(Artifact it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationItem_3094(InformationItem it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private Boolean isAbstract_InformationItem_3094(InformationItem it) {

+		// InformationItem is Abstract

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Signal_3095(Signal it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_UseCase_3096(UseCase it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_3097(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationConstraint_3116(DurationConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_DurationConstraint_3116(DurationConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeConstraint_3117(TimeConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_TimeConstraint_3117(TimeConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_IntervalConstraint_3118(IntervalConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_IntervalConstraint_3118(IntervalConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InteractionConstraint_3119(InteractionConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_InteractionConstraint_3119(InteractionConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_3120(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_3120(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_3101(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Operation_3102(Operation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_EnumerationLiteral_3066(EnumerationLiteral it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ComponentRealization_4004(ComponentRealization it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InterfaceRealization_4005(InterfaceRealization it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Substitution_4011(Substitution it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Realization_4006(Realization it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Manifestation_4012(Manifestation it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Abstraction_4007(Abstraction it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Usage_4008(Usage it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Deployment_4009(Deployment it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Dependency_4010(Dependency it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Connector_4013(Connector it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationFlow_4021(InformationFlow it) {

+		return NamedElementUtil.getDefaultNameWithIncrement(it, it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ElementInitializers getInstance() {

+		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();

+		if (cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());

+		}

+		return cached;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
index ef26a0645a3..29cb127f9eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
@@ -25,6 +25,8 @@ public class UMLEditPartProvider extends DefaultEditPartProvider {
 	 * @generated

 	 */

 	public UMLEditPartProvider() {

-		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, CompositeStructureDiagramEditPart.MODEL_ID);

+		super(new UMLEditPartFactory(),

+				UMLVisualIDRegistry.TYPED_INSTANCE,

+				CompositeStructureDiagramEditPart.MODEL_ID);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
index 226bce358fe..e1ec1614527 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
@@ -626,109 +626,311 @@ public class UMLElementTypes {
 		Object type = hint.getAdapter(IElementType.class);

 		if (elements == null) {

 			elements = new IdentityHashMap<IElementType, ENamedElement>();

+

 			elements.put(Package_1000, UMLPackage.eINSTANCE.getPackage());

+

+

 			elements.put(Activity_2060, UMLPackage.eINSTANCE.getActivity());

+

+

 			elements.put(Interaction_2061, UMLPackage.eINSTANCE.getInteraction());

+

+

 			elements.put(ProtocolStateMachine_2062, UMLPackage.eINSTANCE.getProtocolStateMachine());

+

+

 			elements.put(StateMachine_2063, UMLPackage.eINSTANCE.getStateMachine());

+

+

 			elements.put(FunctionBehavior_2064, UMLPackage.eINSTANCE.getFunctionBehavior());

+

+

 			elements.put(OpaqueBehavior_2065, UMLPackage.eINSTANCE.getOpaqueBehavior());

+

+

 			elements.put(Component_2069, UMLPackage.eINSTANCE.getComponent());

+

+

 			elements.put(Device_2070, UMLPackage.eINSTANCE.getDevice());

+

+

 			elements.put(ExecutionEnvironment_2071, UMLPackage.eINSTANCE.getExecutionEnvironment());

+

+

 			elements.put(Node_2072, UMLPackage.eINSTANCE.getNode());

+

+

 			elements.put(Class_2073, UMLPackage.eINSTANCE.getClass_());

+

+

 			elements.put(Collaboration_2075, UMLPackage.eINSTANCE.getCollaboration());

+

+

 			elements.put(Interface_2076, UMLPackage.eINSTANCE.getInterface());

+

+

 			elements.put(PrimitiveType_2066, UMLPackage.eINSTANCE.getPrimitiveType());

+

+

 			elements.put(Enumeration_2067, UMLPackage.eINSTANCE.getEnumeration());

+

+

 			elements.put(DataType_2068, UMLPackage.eINSTANCE.getDataType());

+

+

 			elements.put(Actor_2077, UMLPackage.eINSTANCE.getActor());

+

+

 			elements.put(DeploymentSpecification_2078, UMLPackage.eINSTANCE.getDeploymentSpecification());

+

+

 			elements.put(Artifact_2079, UMLPackage.eINSTANCE.getArtifact());

+

+

 			elements.put(InformationItem_2080, UMLPackage.eINSTANCE.getInformationItem());

+

+

 			elements.put(Signal_2081, UMLPackage.eINSTANCE.getSignal());

+

+

 			elements.put(UseCase_2082, UMLPackage.eINSTANCE.getUseCase());

+

+

 			elements.put(SignalEvent_2083, UMLPackage.eINSTANCE.getSignalEvent());

+

+

 			elements.put(CallEvent_2084, UMLPackage.eINSTANCE.getCallEvent());

+

+

 			elements.put(AnyReceiveEvent_2085, UMLPackage.eINSTANCE.getAnyReceiveEvent());

+

+

 			elements.put(ChangeEvent_2088, UMLPackage.eINSTANCE.getChangeEvent());

+

+

 			elements.put(TimeEvent_2089, UMLPackage.eINSTANCE.getTimeEvent());

+

+

 			elements.put(DurationObservation_2093, UMLPackage.eINSTANCE.getDurationObservation());

+

+

 			elements.put(TimeObservation_2094, UMLPackage.eINSTANCE.getTimeObservation());

+

+

 			elements.put(LiteralBoolean_2095, UMLPackage.eINSTANCE.getLiteralBoolean());

+

+

 			elements.put(LiteralInteger_2096, UMLPackage.eINSTANCE.getLiteralInteger());

+

+

 			elements.put(LiteralNull_2097, UMLPackage.eINSTANCE.getLiteralNull());

+

+

 			elements.put(LiteralString_2098, UMLPackage.eINSTANCE.getLiteralString());

+

+

 			elements.put(LiteralUnlimitedNatural_2099, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

+

+

 			elements.put(StringExpression_2100, UMLPackage.eINSTANCE.getStringExpression());

+

+

 			elements.put(OpaqueExpression_2101, UMLPackage.eINSTANCE.getOpaqueExpression());

+

+

 			elements.put(TimeExpression_2102, UMLPackage.eINSTANCE.getTimeExpression());

+

+

 			elements.put(Expression_2103, UMLPackage.eINSTANCE.getExpression());

+

+

 			elements.put(Duration_2104, UMLPackage.eINSTANCE.getDuration());

+

+

 			elements.put(TimeInterval_2105, UMLPackage.eINSTANCE.getTimeInterval());

+

+

 			elements.put(DurationInterval_2106, UMLPackage.eINSTANCE.getDurationInterval());

+

+

 			elements.put(Interval_2107, UMLPackage.eINSTANCE.getInterval());

+

+

 			elements.put(InstanceValue_2108, UMLPackage.eINSTANCE.getInstanceValue());

+

+

 			elements.put(Comment_2109, UMLPackage.eINSTANCE.getComment());

+

+

 			elements.put(DurationConstraint_2110, UMLPackage.eINSTANCE.getDurationConstraint());

+

+

 			elements.put(TimeConstraint_2111, UMLPackage.eINSTANCE.getTimeConstraint());

+

+

 			elements.put(IntervalConstraint_2112, UMLPackage.eINSTANCE.getIntervalConstraint());

+

+

 			elements.put(InteractionConstraint_2113, UMLPackage.eINSTANCE.getInteractionConstraint());

+

+

 			elements.put(Constraint_2114, UMLPackage.eINSTANCE.getConstraint());

+

+

 			elements.put(Port_3069, UMLPackage.eINSTANCE.getPort());

+

+

 			elements.put(Parameter_3088, UMLPackage.eINSTANCE.getParameter());

+

+

 			elements.put(Property_3070, UMLPackage.eINSTANCE.getProperty());

+

+

 			elements.put(ConnectableElement_3115, UMLPackage.eINSTANCE.getConnectableElement());

+

+

 			elements.put(CollaborationUse_3071, UMLPackage.eINSTANCE.getCollaborationUse());

+

+

 			elements.put(Activity_3072, UMLPackage.eINSTANCE.getActivity());

+

+

 			elements.put(Interaction_3073, UMLPackage.eINSTANCE.getInteraction());

+

+

 			elements.put(ProtocolStateMachine_3074, UMLPackage.eINSTANCE.getProtocolStateMachine());

+

+

 			elements.put(StateMachine_3075, UMLPackage.eINSTANCE.getStateMachine());

+

+

 			elements.put(FunctionBehavior_3076, UMLPackage.eINSTANCE.getFunctionBehavior());

+

+

 			elements.put(OpaqueBehavior_3077, UMLPackage.eINSTANCE.getOpaqueBehavior());

+

+

 			elements.put(Component_3081, UMLPackage.eINSTANCE.getComponent());

+

+

 			elements.put(Device_3082, UMLPackage.eINSTANCE.getDevice());

+

+

 			elements.put(ExecutionEnvironment_3083, UMLPackage.eINSTANCE.getExecutionEnvironment());

+

+

 			elements.put(Node_3084, UMLPackage.eINSTANCE.getNode());

+

+

 			elements.put(Class_3085, UMLPackage.eINSTANCE.getClass_());

+

+

 			elements.put(Collaboration_3086, UMLPackage.eINSTANCE.getCollaboration());

+

+

 			elements.put(Interface_3087, UMLPackage.eINSTANCE.getInterface());

+

+

 			elements.put(PrimitiveType_3078, UMLPackage.eINSTANCE.getPrimitiveType());

+

+

 			elements.put(Enumeration_3079, UMLPackage.eINSTANCE.getEnumeration());

+

+

 			elements.put(DataType_3080, UMLPackage.eINSTANCE.getDataType());

+

+

 			elements.put(Actor_3091, UMLPackage.eINSTANCE.getActor());

+

+

 			elements.put(DeploymentSpecification_3092, UMLPackage.eINSTANCE.getDeploymentSpecification());

+

+

 			elements.put(Artifact_3093, UMLPackage.eINSTANCE.getArtifact());

+

+

 			elements.put(InformationItem_3094, UMLPackage.eINSTANCE.getInformationItem());

+

+

 			elements.put(Signal_3095, UMLPackage.eINSTANCE.getSignal());

+

+

 			elements.put(UseCase_3096, UMLPackage.eINSTANCE.getUseCase());

+

+

 			elements.put(Comment_3097, UMLPackage.eINSTANCE.getComment());

+

+

 			elements.put(DurationConstraint_3116, UMLPackage.eINSTANCE.getDurationConstraint());

+

+

 			elements.put(TimeConstraint_3117, UMLPackage.eINSTANCE.getTimeConstraint());

+

+

 			elements.put(IntervalConstraint_3118, UMLPackage.eINSTANCE.getIntervalConstraint());

+

+

 			elements.put(InteractionConstraint_3119, UMLPackage.eINSTANCE.getInteractionConstraint());

+

+

 			elements.put(Constraint_3120, UMLPackage.eINSTANCE.getConstraint());

+

+

 			elements.put(Property_3101, UMLPackage.eINSTANCE.getProperty());

+

+

 			elements.put(Operation_3102, UMLPackage.eINSTANCE.getOperation());

+

+

 			elements.put(EnumerationLiteral_3066, UMLPackage.eINSTANCE.getEnumerationLiteral());

+

 			elements.put(CommentAnnotatedElement_4002, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

+

 			elements.put(ConstraintConstrainedElement_4003, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

+

+

 			elements.put(ComponentRealization_4004, UMLPackage.eINSTANCE.getComponentRealization());

+

+

 			elements.put(InterfaceRealization_4005, UMLPackage.eINSTANCE.getInterfaceRealization());

+

+

 			elements.put(Substitution_4011, UMLPackage.eINSTANCE.getSubstitution());

+

+

 			elements.put(Realization_4006, UMLPackage.eINSTANCE.getRealization());

+

+

 			elements.put(Manifestation_4012, UMLPackage.eINSTANCE.getManifestation());

+

+

 			elements.put(Abstraction_4007, UMLPackage.eINSTANCE.getAbstraction());

+

+

 			elements.put(Usage_4008, UMLPackage.eINSTANCE.getUsage());

+

+

 			elements.put(Deployment_4009, UMLPackage.eINSTANCE.getDeployment());

+

+

 			elements.put(Dependency_4017, UMLPackage.eINSTANCE.getDependency());

+

+

 			elements.put(Dependency_4010, UMLPackage.eINSTANCE.getDependency());

+

+

 			elements.put(Connector_4013, UMLPackage.eINSTANCE.getConnector());

+

+

 			elements.put(Generalization_4015, UMLPackage.eINSTANCE.getGeneralization());

+

 			elements.put(TimeObservationEvent_4018, UMLPackage.eINSTANCE.getTimeObservation_Event());

+

 			elements.put(DurationObservationEvent_4019, UMLPackage.eINSTANCE.getDurationObservation_Event());

+

 			elements.put(InformationItemRepresented_4020, UMLPackage.eINSTANCE.getInformationItem_Represented());

+

+

 			elements.put(InformationFlow_4021, UMLPackage.eINSTANCE.getInformationFlow());

 		}

 		return elements.get(type);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
index 502ba7df767..6a5a870b8a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
@@ -45,7 +45,8 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 		if (elementId == null || !(getEditor() instanceof DiagramEditor)) {

 			return;

 		}

-		DiagramEditor editor = (DiagramEditor) getEditor();

+		DiagramEditor editor =

+				(DiagramEditor) getEditor();

 		Map<?, ?> editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();

 		EObject targetView = editor.getDiagram().eResource().getEObject(elementId);

 		if (targetView == null) {

@@ -53,7 +54,8 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 		}

 		EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView);

 		if (targetEditPart != null) {

-			UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart }));

+			UMLDiagramEditorUtil.selectElementsInDiagram(

+					editor, Arrays.asList(new EditPart[] { targetEditPart }));

 		}

 	}

 

@@ -81,7 +83,8 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr
 			int markerSeverity = IMarker.SEVERITY_INFO;

 			if (statusSeverity == IStatus.WARNING) {

 				markerSeverity = IMarker.SEVERITY_WARNING;

-			} else if (statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) {

+			} else if (statusSeverity == IStatus.ERROR ||

+					statusSeverity == IStatus.CANCEL) {

 				markerSeverity = IMarker.SEVERITY_ERROR;

 			}

 			marker.setAttribute(IMarker.SEVERITY, markerSeverity);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
index a5701b4a112..218fbb4940d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
@@ -47,7 +47,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivityName_5112Parser() {

 		if (activityName_5112Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -67,7 +69,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionName_5113Parser() {

 		if (interactionName_5113Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -87,7 +91,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachineName_5114Parser() {

 		if (protocolStateMachineName_5114Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -107,7 +113,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachineName_5115Parser() {

 		if (stateMachineName_5115Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -127,7 +135,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehaviorName_5116Parser() {

 		if (functionBehaviorName_5116Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -147,7 +157,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehaviorName_5117Parser() {

 		if (opaqueBehaviorName_5117Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -167,7 +179,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponentName_5121Parser() {

 		if (componentName_5121Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -187,7 +201,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeviceName_5122Parser() {

 		if (deviceName_5122Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -207,7 +223,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironmentName_5123Parser() {

 		if (executionEnvironmentName_5123Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -227,7 +245,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNodeName_5124Parser() {

 		if (nodeName_5124Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -247,7 +267,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClassName_5156Parser() {

 		if (className_5156Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -267,7 +289,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaborationName_5158Parser() {

 		if (collaborationName_5158Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -287,7 +311,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterfaceName_5159Parser() {

 		if (interfaceName_5159Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -307,7 +333,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveTypeName_5118Parser() {

 		if (primitiveTypeName_5118Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -327,7 +355,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumerationName_5119Parser() {

 		if (enumerationName_5119Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -347,7 +377,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataTypeName_5120Parser() {

 		if (dataTypeName_5120Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -367,7 +399,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActorName_5160Parser() {

 		if (actorName_5160Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -387,7 +421,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecificationName_5161Parser() {

 		if (deploymentSpecificationName_5161Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -407,7 +443,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifactName_5162Parser() {

 		if (artifactName_5162Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -427,7 +465,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItemName_5163Parser() {

 		if (informationItemName_5163Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -447,7 +487,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignalName_5164Parser() {

 		if (signalName_5164Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -467,7 +509,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCaseName_5165Parser() {

 		if (useCaseName_5165Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -487,7 +531,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignalEventName_5166Parser() {

 		if (signalEventName_5166Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -507,7 +553,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCallEventName_5167Parser() {

 		if (callEventName_5167Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -527,7 +575,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getAnyReceiveEventName_5168Parser() {

 		if (anyReceiveEventName_5168Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -547,7 +597,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getChangeEventName_5171Parser() {

 		if (changeEventName_5171Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -567,7 +619,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeEventName_5172Parser() {

 		if (timeEventName_5172Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -587,7 +641,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationObservationName_5151Parser() {

 		if (durationObservationName_5151Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationObservationName_5151Parser = parser;

 		}

@@ -619,7 +675,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeObservationName_5142Parser() {

 		if (timeObservationName_5142Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeObservationName_5142Parser = parser;

 		}

@@ -651,7 +709,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralBooleanName_5178Parser() {

 		if (literalBooleanName_5178Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -671,7 +731,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralIntegerName_5179Parser() {

 		if (literalIntegerName_5179Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -691,7 +753,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralNullName_5180Parser() {

 		if (literalNullName_5180Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -711,7 +775,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralStringName_5181Parser() {

 		if (literalStringName_5181Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -731,7 +797,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getLiteralUnlimitedNaturalName_5182Parser() {

 		if (literalUnlimitedNaturalName_5182Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -751,7 +819,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStringExpressionName_5183Parser() {

 		if (stringExpressionName_5183Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -771,7 +841,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueExpressionName_5184Parser() {

 		if (opaqueExpressionName_5184Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -791,7 +863,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeExpressionName_5185Parser() {

 		if (timeExpressionName_5185Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -811,7 +885,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExpressionName_5186Parser() {

 		if (expressionName_5186Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -831,7 +907,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationName_5187Parser() {

 		if (durationName_5187Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -851,7 +929,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeIntervalName_5188Parser() {

 		if (timeIntervalName_5188Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -871,7 +951,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationIntervalName_5189Parser() {

 		if (durationIntervalName_5189Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -891,7 +973,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getIntervalName_5190Parser() {

 		if (intervalName_5190Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -911,7 +995,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInstanceValueName_5191Parser() {

 		if (instanceValueName_5191Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -946,7 +1032,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationConstraintName_5193Parser() {

 		if (durationConstraintName_5193Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationConstraintName_5193Parser = parser;

 		}

@@ -978,7 +1066,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeConstraintName_5194Parser() {

 		if (timeConstraintName_5194Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeConstraintName_5194Parser = parser;

 		}

@@ -1010,7 +1100,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getIntervalConstraintName_5195Parser() {

 		if (intervalConstraintName_5195Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalConstraintName_5195Parser = parser;

 		}

@@ -1042,7 +1134,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionConstraintName_5196Parser() {

 		if (interactionConstraintName_5196Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionConstraintName_5196Parser = parser;

 		}

@@ -1074,7 +1168,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConstraintName_5197Parser() {

 		if (constraintName_5197Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_5197Parser = parser;

 		}

@@ -1106,7 +1202,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPortName_5125Parser() {

 		if (portName_5125Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			portName_5125Parser = parser;

 		}

@@ -1138,7 +1236,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getParameterName_6033Parser() {

 		if (parameterName_6033Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parameterName_6033Parser = parser;

 		}

@@ -1170,7 +1270,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPropertyName_5126Parser() {

 		if (propertyName_5126Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			propertyName_5126Parser = parser;

 		}

@@ -1187,7 +1289,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectableElementName_5198Parser() {

 		if (connectableElementName_5198Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1207,7 +1311,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaborationUseName_5127Parser() {

 		if (collaborationUseName_5127Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			collaborationUseName_5127Parser = parser;

 		}

@@ -1224,7 +1330,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActivityName_5128Parser() {

 		if (activityName_5128Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1244,7 +1352,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionName_5129Parser() {

 		if (interactionName_5129Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1264,7 +1374,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProtocolStateMachineName_5130Parser() {

 		if (protocolStateMachineName_5130Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1284,7 +1396,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getStateMachineName_5131Parser() {

 		if (stateMachineName_5131Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1304,7 +1418,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getFunctionBehaviorName_5132Parser() {

 		if (functionBehaviorName_5132Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1324,7 +1440,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOpaqueBehaviorName_5133Parser() {

 		if (opaqueBehaviorName_5133Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1344,7 +1462,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponentName_5137Parser() {

 		if (componentName_5137Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1364,7 +1484,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeviceName_5138Parser() {

 		if (deviceName_5138Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1384,7 +1506,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getExecutionEnvironmentName_5139Parser() {

 		if (executionEnvironmentName_5139Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1404,7 +1528,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getNodeName_5140Parser() {

 		if (nodeName_5140Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1424,7 +1550,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getClassName_5155Parser() {

 		if (className_5155Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1444,7 +1572,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getCollaborationName_5141Parser() {

 		if (collaborationName_5141Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1464,7 +1594,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterfaceName_5154Parser() {

 		if (interfaceName_5154Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1484,7 +1616,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getPrimitiveTypeName_5134Parser() {

 		if (primitiveTypeName_5134Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1504,7 +1638,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumerationName_5135Parser() {

 		if (enumerationName_5135Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1524,7 +1660,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDataTypeName_5136Parser() {

 		if (dataTypeName_5136Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1544,7 +1682,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getActorName_5144Parser() {

 		if (actorName_5144Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1564,7 +1704,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentSpecificationName_5145Parser() {

 		if (deploymentSpecificationName_5145Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1584,7 +1726,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getArtifactName_5146Parser() {

 		if (artifactName_5146Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1604,7 +1748,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInformationItemName_5147Parser() {

 		if (informationItemName_5147Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1624,7 +1770,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSignalName_5148Parser() {

 		if (signalName_5148Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1644,7 +1792,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUseCaseName_5149Parser() {

 		if (useCaseName_5149Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1679,7 +1829,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDurationConstraintName_6040Parser() {

 		if (durationConstraintName_6040Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			durationConstraintName_6040Parser = parser;

 		}

@@ -1711,7 +1863,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getTimeConstraintName_6042Parser() {

 		if (timeConstraintName_6042Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			timeConstraintName_6042Parser = parser;

 		}

@@ -1743,7 +1897,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getIntervalConstraintName_6044Parser() {

 		if (intervalConstraintName_6044Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			intervalConstraintName_6044Parser = parser;

 		}

@@ -1775,7 +1931,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInteractionConstraintName_6046Parser() {

 		if (interactionConstraintName_6046Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interactionConstraintName_6046Parser = parser;

 		}

@@ -1807,7 +1965,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConstraintName_6048Parser() {

 		if (constraintName_6048Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			constraintName_6048Parser = parser;

 		}

@@ -1839,7 +1999,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getProperty_3101Parser() {

 		if (property_3101Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1859,7 +2021,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getOperation_3102Parser() {

 		if (operation_3102Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1879,7 +2043,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getEnumerationLiteral_3066Parser() {

 		if (enumerationLiteral_3066Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("{0}  "); //$NON-NLS-1$

 			parser.setEditorPattern("{0}"); //$NON-NLS-1$

@@ -1899,7 +2065,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getComponentRealizationName_6001Parser() {

 		if (componentRealizationName_6001Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			componentRealizationName_6001Parser = parser;

 		}

@@ -1931,7 +2099,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getInterfaceRealizationName_6002Parser() {

 		if (interfaceRealizationName_6002Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			interfaceRealizationName_6002Parser = parser;

 		}

@@ -1963,7 +2133,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getSubstitutionName_6003Parser() {

 		if (substitutionName_6003Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			substitutionName_6003Parser = parser;

 		}

@@ -1995,7 +2167,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getRealizationName_6004Parser() {

 		if (realizationName_6004Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			realizationName_6004Parser = parser;

 		}

@@ -2027,7 +2201,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getManifestationName_6005Parser() {

 		if (manifestationName_6005Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			manifestationName_6005Parser = parser;

 		}

@@ -2059,7 +2235,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getAbstractionName_6006Parser() {

 		if (abstractionName_6006Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			abstractionName_6006Parser = parser;

 		}

@@ -2091,7 +2269,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getUsageName_6007Parser() {

 		if (usageName_6007Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			usageName_6007Parser = parser;

 		}

@@ -2123,7 +2303,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDeploymentName_6008Parser() {

 		if (deploymentName_6008Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			deploymentName_6008Parser = parser;

 		}

@@ -2185,7 +2367,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getDependencyName_6009Parser() {

 		if (dependencyName_6009Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			dependencyName_6009Parser = parser;

 		}

@@ -2232,7 +2416,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectorName_6050Parser() {

 		if (connectorName_6050Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			connectorName_6050Parser = parser;

 		}

@@ -2249,7 +2435,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectorName_6051Parser() {

 		if (connectorName_6051Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("sourceMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("sourceMul{0}"); //$NON-NLS-1$

@@ -2269,7 +2457,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	 */

 	private IParser getConnectorName_6052Parser() {

 		if (connectorName_6052Parser == null) {

-			EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };

+			EAttribute[] features = new EAttribute[] {

+					UMLPackage.eINSTANCE.getNamedElement_Name()

+			};

 			MessageFormatParser parser = new MessageFormatParser(features);

 			parser.setViewPattern("targetMul{0}"); //$NON-NLS-1$

 			parser.setEditorPattern("targetMul{0}"); //$NON-NLS-1$

@@ -2316,242 +2506,339 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 		switch (visualID) {

 		case ActivityCompositeNameEditPart.VISUAL_ID:

 			return getActivityName_5112Parser();

+

 		case InteractionCompositeNameEditPart.VISUAL_ID:

 			return getInteractionName_5113Parser();

+

 		case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

 			return getProtocolStateMachineName_5114Parser();

+

 		case StateMachineCompositeNameEditPart.VISUAL_ID:

 			return getStateMachineName_5115Parser();

+

 		case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

 			return getFunctionBehaviorName_5116Parser();

+

 		case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

 			return getOpaqueBehaviorName_5117Parser();

+

 		case ComponentCompositeNameEditPart.VISUAL_ID:

 			return getComponentName_5121Parser();

+

 		case DeviceCompositeNameEditPart.VISUAL_ID:

 			return getDeviceName_5122Parser();

+

 		case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

 			return getExecutionEnvironmentName_5123Parser();

+

 		case NodeCompositeNameEditPart.VISUAL_ID:

 			return getNodeName_5124Parser();

+

 		case ClassCompositeNameEditPart.VISUAL_ID:

 			return getClassName_5156Parser();

+

 		case CollaborationCompositeNameEditPart.VISUAL_ID:

 			return getCollaborationName_5158Parser();

+

 		case InterfaceNameEditPart.VISUAL_ID:

 			return getInterfaceName_5159Parser();

+

 		case PrimitiveTypeNameEditPart.VISUAL_ID:

 			return getPrimitiveTypeName_5118Parser();

+

 		case EnumerationNameEditPart.VISUAL_ID:

 			return getEnumerationName_5119Parser();

+

 		case DataTypeNameEditPart.VISUAL_ID:

 			return getDataTypeName_5120Parser();

+

 		case ActorNameEditPart.VISUAL_ID:

 			return getActorName_5160Parser();

+

 		case DeploymentSpecificationNameEditPart.VISUAL_ID:

 			return getDeploymentSpecificationName_5161Parser();

+

 		case ArtifactNameEditPart.VISUAL_ID:

 			return getArtifactName_5162Parser();

+

 		case InformationItemNameEditPart.VISUAL_ID:

 			return getInformationItemName_5163Parser();

+

 		case SignalNameEditPart.VISUAL_ID:

 			return getSignalName_5164Parser();

+

 		case UseCaseNameEditPart.VISUAL_ID:

 			return getUseCaseName_5165Parser();

+

 		case SignalEventNameEditPart.VISUAL_ID:

 			return getSignalEventName_5166Parser();

+

 		case CallEventNameEditPart.VISUAL_ID:

 			return getCallEventName_5167Parser();

+

 		case AnyReceiveEventNameEditPart.VISUAL_ID:

 			return getAnyReceiveEventName_5168Parser();

+

 		case ChangeEventNameEditPart.VISUAL_ID:

 			return getChangeEventName_5171Parser();

+

 		case TimeEventNameEditPart.VISUAL_ID:

 			return getTimeEventName_5172Parser();

+

 		case DurationObservationNameEditPart.VISUAL_ID:

 			return getDurationObservationName_5151Parser();

 		case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

 			return getDurationObservationName_5152Parser();

+

 		case TimeObservationNameEditPart.VISUAL_ID:

 			return getTimeObservationName_5142Parser();

 		case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

 			return getTimeObservationName_5143Parser();

+

 		case LiteralBooleanNameEditPart.VISUAL_ID:

 			return getLiteralBooleanName_5178Parser();

+

 		case LiteralIntegerNameEditPart.VISUAL_ID:

 			return getLiteralIntegerName_5179Parser();

+

 		case LiteralNullNameEditPart.VISUAL_ID:

 			return getLiteralNullName_5180Parser();

+

 		case LiteralStringNameEditPart.VISUAL_ID:

 			return getLiteralStringName_5181Parser();

+

 		case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

 			return getLiteralUnlimitedNaturalName_5182Parser();

+

 		case StringExpressionNameEditPart.VISUAL_ID:

 			return getStringExpressionName_5183Parser();

+

 		case OpaqueExpressionNameEditPart.VISUAL_ID:

 			return getOpaqueExpressionName_5184Parser();

+

 		case TimeExpressionNameEditPart.VISUAL_ID:

 			return getTimeExpressionName_5185Parser();

+

 		case ExpressionNameEditPart.VISUAL_ID:

 			return getExpressionName_5186Parser();

+

 		case DurationNameEditPart.VISUAL_ID:

 			return getDurationName_5187Parser();

+

 		case TimeIntervalNameEditPart.VISUAL_ID:

 			return getTimeIntervalName_5188Parser();

+

 		case DurationIntervalNameEditPart.VISUAL_ID:

 			return getDurationIntervalName_5189Parser();

+

 		case IntervalNameEditPart.VISUAL_ID:

 			return getIntervalName_5190Parser();

+

 		case InstanceValueNameEditPart.VISUAL_ID:

 			return getInstanceValueName_5191Parser();

+

 		case CommentBodyEditPart.VISUAL_ID:

 			return getCommentBody_5192Parser();

+

 		case DurationConstraintNameEditPart.VISUAL_ID:

 			return getDurationConstraintName_5193Parser();

 		case DurationConstraintSpecificationEditPart.VISUAL_ID:

 			return getDurationConstraintSpecification_6035Parser();

+

 		case TimeConstraintNameEditPart.VISUAL_ID:

 			return getTimeConstraintName_5194Parser();

 		case TimeConstraintSpecificationEditPart.VISUAL_ID:

 			return getTimeConstraintSpecification_6036Parser();

+

 		case IntervalConstraintNameEditPart.VISUAL_ID:

 			return getIntervalConstraintName_5195Parser();

 		case IntervalConstraintSpecificationEditPart.VISUAL_ID:

 			return getIntervalConstraintSpecification_6037Parser();

+

 		case InteractionConstraintNameEditPart.VISUAL_ID:

 			return getInteractionConstraintName_5196Parser();

 		case InteractionConstraintSpecificationEditPart.VISUAL_ID:

 			return getInteractionConstraintSpecification_6038Parser();

+

 		case ConstraintNameEditPart.VISUAL_ID:

 			return getConstraintName_5197Parser();

 		case ConstraintSpecificationEditPart.VISUAL_ID:

 			return getConstraintSpecification_6039Parser();

+

+

 		case PortNameEditPart.VISUAL_ID:

 			return getPortName_5125Parser();

 		case PortAppliedStereotypeEditPart.VISUAL_ID:

 			return getPortName_6029Parser();

+

 		case ParameterNameEditPart.VISUAL_ID:

 			return getParameterName_6033Parser();

 		case ParameterAppliedStereotypeEditPart.VISUAL_ID:

 			return getParameterName_6034Parser();

+

 		case PropertyPartNameEditPartCN.VISUAL_ID:

 			return getPropertyName_5126Parser();

+

 		case CollaborationRoleNameEditPartCN.VISUAL_ID:

 			return getConnectableElementName_5198Parser();

+

 		case CollaborationUseNameEditPart.VISUAL_ID:

 			return getCollaborationUseName_5127Parser();

+

 		case ActivityCompositeNameEditPartCN.VISUAL_ID:

 			return getActivityName_5128Parser();

+

 		case InteractionCompositeNameEditPartCN.VISUAL_ID:

 			return getInteractionName_5129Parser();

+

 		case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

 			return getProtocolStateMachineName_5130Parser();

+

 		case StateMachineCompositeNameEditPartCN.VISUAL_ID:

 			return getStateMachineName_5131Parser();

+

 		case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

 			return getFunctionBehaviorName_5132Parser();

+

 		case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

 			return getOpaqueBehaviorName_5133Parser();

+

 		case ComponentCompositeNameEditPartCN.VISUAL_ID:

 			return getComponentName_5137Parser();

+

 		case DeviceCompositeNameEditPartCN.VISUAL_ID:

 			return getDeviceName_5138Parser();

+

 		case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

 			return getExecutionEnvironmentName_5139Parser();

+

 		case NodeCompositeNameEditPartCN.VISUAL_ID:

 			return getNodeName_5140Parser();

+

 		case ClassCompositeNameEditPartCN.VISUAL_ID:

 			return getClassName_5155Parser();

+

 		case CollaborationCompositeNameEditPartCN.VISUAL_ID:

 			return getCollaborationName_5141Parser();

+

 		case InterfaceNameEditPartCN.VISUAL_ID:

 			return getInterfaceName_5154Parser();

+

 		case PrimitiveTypeNameEditPartCN.VISUAL_ID:

 			return getPrimitiveTypeName_5134Parser();

+

 		case EnumerationNameEditPartCN.VISUAL_ID:

 			return getEnumerationName_5135Parser();

+

 		case DataTypeNameEditPartCN.VISUAL_ID:

 			return getDataTypeName_5136Parser();

+

 		case ActorNameEditPartCN.VISUAL_ID:

 			return getActorName_5144Parser();

+

 		case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

 			return getDeploymentSpecificationName_5145Parser();

+

 		case ArtifactNameEditPartCN.VISUAL_ID:

 			return getArtifactName_5146Parser();

+

 		case InformationItemNameEditPartCN.VISUAL_ID:

 			return getInformationItemName_5147Parser();

+

 		case SignalNameEditPartCN.VISUAL_ID:

 			return getSignalName_5148Parser();

+

 		case UseCaseNameEditPartCN.VISUAL_ID:

 			return getUseCaseName_5149Parser();

+

 		case CommentBodyEditPartCN.VISUAL_ID:

 			return getCommentBody_5150Parser();

+

 		case DurationConstraintNameEditPartCN.VISUAL_ID:

 			return getDurationConstraintName_6040Parser();

 		case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getDurationConstraintSpecification_6041Parser();

+

 		case TimeConstraintNameEditPartCN.VISUAL_ID:

 			return getTimeConstraintName_6042Parser();

 		case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getTimeConstraintSpecification_6043Parser();

+

 		case IntervalConstraintNameEditPartCN.VISUAL_ID:

 			return getIntervalConstraintName_6044Parser();

 		case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getIntervalConstraintSpecification_6045Parser();

+

 		case InteractionConstraintNameEditPartCN.VISUAL_ID:

 			return getInteractionConstraintName_6046Parser();

 		case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getInteractionConstraintSpecification_6047Parser();

+

 		case ConstraintNameEditPartCN.VISUAL_ID:

 			return getConstraintName_6048Parser();

 		case ConstraintSpecificationEditPartCN.VISUAL_ID:

 			return getConstraintSpecification_6049Parser();

+

 		case PropertyEditPartCLN.VISUAL_ID:

 			return getProperty_3101Parser();

 		case OperationEditPartCLN.VISUAL_ID:

 			return getOperation_3102Parser();

 		case EnumerationLiteralEditPartCLN.VISUAL_ID:

 			return getEnumerationLiteral_3066Parser();

+

+

+

+

 		case ComponentRealizationNameEditPart.VISUAL_ID:

 			return getComponentRealizationName_6001Parser();

 		case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getComponentRealizationName_6015Parser();

+

 		case InterfaceRealizationNameEditPart.VISUAL_ID:

 			return getInterfaceRealizationName_6002Parser();

 		case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getInterfaceRealizationName_6016Parser();

+

 		case SubstitutionNameEditPart.VISUAL_ID:

 			return getSubstitutionName_6003Parser();

 		case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

 			return getSubstitutionName_6017Parser();

+

 		case RealizationNameEditPart.VISUAL_ID:

 			return getRealizationName_6004Parser();

 		case RealizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getRealizationName_6018Parser();

+

 		case ManifestationNameEditPart.VISUAL_ID:

 			return getManifestationName_6005Parser();

 		case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

 			return getManifestationName_6019Parser();

+

 		case AbstractionNameEditPart.VISUAL_ID:

 			return getAbstractionName_6006Parser();

 		case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

 			return getAbstractionName_6020Parser();

+

 		case UsageNameEditPart.VISUAL_ID:

 			return getUsageName_6007Parser();

 		case UsageAppliedStereotypeEditPart.VISUAL_ID:

 			return getUsageName_6021Parser();

+

 		case DeploymentNameEditPart.VISUAL_ID:

 			return getDeploymentName_6008Parser();

 		case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

 			return getDeploymentName_6022Parser();

+

 		case RoleBindingRoleNameEditPart.VISUAL_ID:

 			return getDependencyName_6027Parser();

 		case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

 			return getDependencyName_6028Parser();

+

 		case DependencyNameEditPart.VISUAL_ID:

 			return getDependencyName_6009Parser();

 		case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 			return getDependencyName_6023Parser();

+

 		case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

 			return getConnectorName_6025Parser();

 		case ConnectorNameEditPart.VISUAL_ID:

@@ -2560,10 +2847,16 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getConnectorName_6051Parser();

 		case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

 			return getConnectorName_6052Parser();

+

 		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getGeneralizationIsSubstitutable_6024Parser();

+

+

+

+

 		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

 			return getInformationFlowName_6032Parser();

+

 		}

 		return null;

 	}

@@ -2586,7 +2879,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 		if (vid != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(vid));

 		}

-		View view = (View) hint.getAdapter(View.class);

+		View view =

+				(View) hint.getAdapter(View.class);

 		if (view != null) {

 			return getParser(UMLVisualIDRegistry.getVisualID(view));

 		}

@@ -2599,7 +2893,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	@Override

 	public boolean provides(IOperation operation) {

 		if (operation instanceof GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation) operation).getHint();

+			IAdaptable hint =

+					((GetParserOperation) operation).getHint();

 			if (UMLElementTypes.getElement(hint) == null) {

 				return false;

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
index 7fc74ae2995..19980582c23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
@@ -38,7 +38,8 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 	@Override

 	public void createDecorators(IDecoratorTarget decoratorTarget) {

 		EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class);

-		if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) {

+		if (editPart instanceof GraphicalEditPart ||

+				editPart instanceof AbstractConnectionEditPart) {

 			Object model = editPart.getModel();

 			if ((model instanceof View)) {

 				View view = (View) model;

@@ -64,8 +65,10 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider
 		if (!(operation instanceof CreateDecoratorsOperation)) {

 			return false;

 		}

-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget();

-		View view = (View) decoratorTarget.getAdapter(View.class);

+		IDecoratorTarget decoratorTarget =

+				((CreateDecoratorsOperation) operation).getDecoratorTarget();

+		View view = (View) decoratorTarget.getAdapter(

+				View.class);

 		return view != null && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
index 3406594a52c..6d5dab16a65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
@@ -40,7 +40,6 @@ public class UMLValidationProvider {
 	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

 		final Runnable op = operation;

 		Runnable task = new Runnable() {

-

 			@Override

 			public void run() {

 				try {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index 3f64f1f5f05..42472d5aaca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -92,20 +92,23 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateViewForKindOperation op) {

 		/*

-		 * if (op.getViewKind() == Node.class)

-		 * return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

-		 * if (op.getViewKind() == Edge.class)

-		 * return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		    if (op.getViewKind() == Node.class)

+		      return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

+		    if (op.getViewKind() == Edge.class)

+		      return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;

 		 */

+

 		// check Diagram Type should be the class diagram

 		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());

 		if (!getDiagramProvidedId().equals(modelID)) {

 			return false;

 		}

+

 		int visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

 		if (Node.class.isAssignableFrom(op.getViewKind())) {

 			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

 		}

+

 		return true;

 	}

 

@@ -291,6 +294,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				|| CommentEditPartCN.VISUAL_ID == visualID || DurationConstraintEditPartCN.VISUAL_ID == visualID || TimeConstraintEditPartCN.VISUAL_ID == visualID || IntervalConstraintEditPartCN.VISUAL_ID == visualID

 				|| InteractionConstraintEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || PropertyEditPartCLN.VISUAL_ID == visualID || OperationEditPartCLN.VISUAL_ID == visualID

 				|| EnumerationLiteralEditPartCLN.VISUAL_ID == visualID;

+

+

 	}

 

 	/**

@@ -298,7 +303,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */

 	protected boolean provides(CreateEdgeViewOperation op) {

 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

-		// RS: add code for extended types creation

+		//RS: add code for extended types creation

 		if (elementType instanceof IExtendedHintedElementType) {

 			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);

 			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {

@@ -309,9 +314,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				return false; // foreign element type

 			}

 		}

-		// if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {

-		// return false; // foreign element type

-		// }

+		//if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {

+		//	return false; // foreign element type

+		//}

 		// END R.S.

 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();

 		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {

@@ -595,6 +600,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

 		Node label5112 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -614,6 +620,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

 		Node label5113 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -633,6 +640,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

 		Node label5114 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -652,6 +660,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

 		Node label5115 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -671,6 +680,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

 		Node label5116 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -690,6 +700,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

 		Node label5117 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -709,6 +720,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

 		Node label5121 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -728,6 +740,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node label5122 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -747,6 +760,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

 		Node label5123 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -766,6 +780,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node label5124 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -785,6 +800,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

 		Node label5156 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -804,6 +820,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

 		Node label5158 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

@@ -823,6 +840,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

 		Node label5159 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

 		return node;

@@ -840,6 +858,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

 		Node label5118 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

 		return node;

@@ -857,6 +876,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

 		Node label5119 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true);

@@ -876,6 +896,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

 		Node label5120 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

@@ -896,6 +917,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

 		Node label5160 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

 		return node;

@@ -913,6 +935,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

 		Node label5161 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

 		return node;

@@ -930,6 +953,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node label5162 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

 		return node;

@@ -947,6 +971,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

 		Node label5163 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

 		return node;

@@ -964,6 +989,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

 		Node label5164 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

 		return node;

@@ -981,6 +1007,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

 		Node label5165 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

 		return node;

@@ -998,6 +1025,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "SignalEvent");

 		Node label5166 = createLabel(node, UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

 		return node;

@@ -1015,6 +1043,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CallEvent");

 		Node label5167 = createLabel(node, UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

 		return node;

@@ -1032,6 +1061,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "AnyReceiveEvent");

 		Node label5168 = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

 		return node;

@@ -1049,6 +1079,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ChangeEvent");

 		Node label5171 = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

 		return node;

@@ -1066,6 +1097,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeEvent");

 		Node label5172 = createLabel(node, UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

 		return node;

@@ -1083,6 +1115,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationObservation");

 		Node label5151 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

 		label5151.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

@@ -1109,6 +1142,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeObservation");

 		Node label5142 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

 		label5142.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

@@ -1135,6 +1169,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralBoolean");

 		Node label5178 = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

 		return node;

@@ -1152,6 +1187,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralInteger");

 		Node label5179 = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

 		return node;

@@ -1169,6 +1205,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralNull");

 		Node label5180 = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

 		return node;

@@ -1186,6 +1223,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralString");

 		Node label5181 = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

 		return node;

@@ -1203,6 +1241,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "LiteralUnlimitedNatural");

 		Node label5182 = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

 		return node;

@@ -1220,6 +1259,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StringExpression");

 		Node label5183 = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

 		return node;

@@ -1237,6 +1277,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueExpression");

 		Node label5184 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

 		return node;

@@ -1254,6 +1295,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeExpression");

 		Node label5185 = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

 		return node;

@@ -1271,6 +1313,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Expression");

 		Node label5186 = createLabel(node, UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

 		return node;

@@ -1288,6 +1331,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Duration");

 		Node label5187 = createLabel(node, UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

 		return node;

@@ -1305,6 +1349,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeInterval");

 		Node label5188 = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

 		return node;

@@ -1322,6 +1367,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationInterval");

 		Node label5189 = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

 		return node;

@@ -1339,6 +1385,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interval");

 		Node label5190 = createLabel(node, UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

 		return node;

@@ -1356,6 +1403,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InstanceValue");

 		Node label5191 = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

 		return node;

@@ -1373,6 +1421,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

 		Node label5192 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

 		return node;

@@ -1390,6 +1439,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

 		Node label5193 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

 		Node label6035 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));

@@ -1408,6 +1458,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

 		Node label5194 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

 		Node label6036 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));

@@ -1426,6 +1477,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

 		Node label5195 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

 		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));

@@ -1444,6 +1496,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

 		Node label5196 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

 		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));

@@ -1462,6 +1515,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		stampShortcut(containerView, node);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

 		Node label5197 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

 		Node label6039 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));

@@ -1479,6 +1533,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		return node;

 	}

 

@@ -1493,6 +1548,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

 		Node label5125 = createLabel(node, UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

 		label5125.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

@@ -1518,6 +1574,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Parameter");

 		Node label6033 = createLabel(node, UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

 		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

@@ -1543,6 +1600,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		Node label5126 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1561,6 +1619,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationRole");

 		Node label5198 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1577,6 +1636,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationUse");

 		Node label5127 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

 		return node;

@@ -1593,6 +1653,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

 		Node label5128 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1611,6 +1672,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

 		Node label5129 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1629,6 +1691,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

 		Node label5130 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1647,6 +1710,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

 		Node label5131 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1665,6 +1729,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

 		Node label5132 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1683,6 +1748,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

 		Node label5133 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1701,6 +1767,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

 		Node label5137 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1719,6 +1786,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

 		Node label5138 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1737,6 +1805,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

 		Node label5139 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1755,6 +1824,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

 		Node label5140 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1773,6 +1843,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

 		Node label5155 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1791,6 +1862,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

 		Node label5141 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

@@ -1809,6 +1881,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

 		Node label5154 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1825,6 +1898,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

 		Node label5134 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1841,6 +1915,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

 		Node label5135 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

@@ -1859,6 +1934,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

 		Node label5136 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

 		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

@@ -1878,6 +1954,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

 		Node label5144 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1894,6 +1971,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

 		Node label5145 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1910,6 +1988,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

 		Node label5146 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1926,6 +2005,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

 		Node label5147 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1942,6 +2022,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

 		Node label5148 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1958,6 +2039,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

 		Node label5149 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

 		return node;

@@ -1974,6 +2056,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment");

 		Node label5150 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

 		return node;

@@ -1990,6 +2073,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

 		Node label6040 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

 		Node label6041 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2007,6 +2091,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

 		Node label6042 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

 		Node label6043 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2024,6 +2109,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

 		Node label6044 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

 		Node label6045 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2041,6 +2127,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

 		Node label6046 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

 		Node label6047 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2058,6 +2145,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setElement(domainElement);

 		// initializeFromPreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

 		Node label6048 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

 		Node label6049 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));

@@ -2073,6 +2161,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(PropertyEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

 		return node;

@@ -2087,6 +2176,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(OperationEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation");

 		return node;

@@ -2101,6 +2191,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPartCLN.VISUAL_ID));

 		ViewUtil.insertChildView(containerView, node, index, persisted);

 		node.setElement(domainElement);

+

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "EnumerationLiteral");

 		return node;

@@ -2123,10 +2214,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2147,10 +2240,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2171,11 +2266,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommentAnnotatedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2196,11 +2293,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ConstraintConstrainedElement");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2221,11 +2320,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6001 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));

 		label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6001 = (Location) label6001.getLayoutConstraint();

@@ -2236,6 +2336,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6015 = (Location) label6015.getLayoutConstraint();

 		location6015.setX(0);

 		location6015.setY(30);

+

 		return edge;

 	}

 

@@ -2256,11 +2357,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

 		label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6002 = (Location) label6002.getLayoutConstraint();

@@ -2271,6 +2373,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6016 = (Location) label6016.getLayoutConstraint();

 		location6016.setX(0);

 		location6016.setY(30);

+

 		return edge;

 	}

 

@@ -2291,11 +2394,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

 		label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6003 = (Location) label6003.getLayoutConstraint();

@@ -2306,6 +2410,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6017 = (Location) label6017.getLayoutConstraint();

 		location6017.setX(0);

 		location6017.setY(30);

+

 		return edge;

 	}

 

@@ -2326,11 +2431,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Realization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6004 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

 		label6004.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6004 = (Location) label6004.getLayoutConstraint();

@@ -2341,6 +2447,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6018 = (Location) label6018.getLayoutConstraint();

 		location6018.setX(0);

 		location6018.setY(30);

+

 		return edge;

 	}

 

@@ -2361,11 +2468,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Manifestation");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));

 		label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6005 = (Location) label6005.getLayoutConstraint();

@@ -2376,6 +2484,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6019 = (Location) label6019.getLayoutConstraint();

 		location6019.setX(0);

 		location6019.setY(30);

+

 		return edge;

 	}

 

@@ -2396,11 +2505,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6006 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

 		label6006.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6006 = (Location) label6006.getLayoutConstraint();

@@ -2411,6 +2521,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6020 = (Location) label6020.getLayoutConstraint();

 		location6020.setX(0);

 		location6020.setY(30);

+

 		return edge;

 	}

 

@@ -2431,11 +2542,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

 		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6007 = (Location) label6007.getLayoutConstraint();

@@ -2446,6 +2558,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6021 = (Location) label6021.getLayoutConstraint();

 		location6021.setX(0);

 		location6021.setY(30);

+

 		return edge;

 	}

 

@@ -2466,11 +2579,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Deployment");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6008 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentNameEditPart.VISUAL_ID));

 		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6008 = (Location) label6008.getLayoutConstraint();

@@ -2481,6 +2595,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6022 = (Location) label6022.getLayoutConstraint();

 		location6022.setX(0);

 		location6022.setY(30);

+

 		return edge;

 	}

 

@@ -2501,11 +2616,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "RoleBinding");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.VISUAL_ID));

 		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6027 = (Location) label6027.getLayoutConstraint();

@@ -2516,6 +2632,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6028 = (Location) label6028.getLayoutConstraint();

 		location6028.setX(0);

 		location6028.setY(60);

+

 		return edge;

 	}

 

@@ -2536,11 +2653,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Dependency");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6009 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

 		label6009.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6009 = (Location) label6009.getLayoutConstraint();

@@ -2551,6 +2669,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6023 = (Location) label6023.getLayoutConstraint();

 		location6023.setX(0);

 		location6023.setY(60);

+

 		return edge;

 	}

 

@@ -2571,11 +2690,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6025 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

 		label6025.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6025 = (Location) label6025.getLayoutConstraint();

@@ -2596,6 +2716,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6052 = (Location) label6052.getLayoutConstraint();

 		location6052.setX(0);

 		location6052.setY(20);

+

 		return edge;

 	}

 

@@ -2616,16 +2737,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

 		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6024 = (Location) label6024.getLayoutConstraint();

 		location6024.setX(0);

 		location6024.setY(60);

+

 		return edge;

 	}

 

@@ -2646,11 +2769,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TimeObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2671,11 +2796,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservationEvent");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+

 		return edge;

 	}

 

@@ -2696,16 +2823,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(null);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.colorToInteger(ColorConstants.black));

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));

 		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6030 = (Location) label6030.getLayoutConstraint();

 		location6030.setX(0);

 		location6030.setY(15);

+

 		return edge;

 	}

 

@@ -2726,11 +2855,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		edge.setElement(domainElement);

 		// initializePreferences

 		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();

+

 		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow");

-		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

-		// if (routing != null) {

-		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

-		// }

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

 		Node label6031 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));

 		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

 		Location location6031 = (Location) label6031.getLayoutConstraint();

@@ -2741,6 +2871,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		Location location6032 = (Location) label6032.getLayoutConstraint();

 		location6032.setX(0);

 		location6032.setY(15);

+

 		return edge;

 	}

 

@@ -2770,16 +2901,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) {

-		// SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

-		// rv.setShowTitle(showTitle);

-		// rv.setCollapsed(isCollapsed);

+		//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();

+		//rv.setShowTitle(showTitle);

+		//rv.setCollapsed(isCollapsed);

 		Node rv;

 		if (canCollapse) {

 			rv = NotationFactory.eINSTANCE.createBasicCompartment();

 		} else {

 			rv = NotationFactory.eINSTANCE.createDecorationNode();

 		}

+

 		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+

 		if (hasTitle) {

 			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

 			rv.getStyles().add(ts);

@@ -2825,13 +2958,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

 		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

 		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

+

 		FontStyle viewFontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE);

-		if (viewFontStyle != null) {

+		if (viewFontStyle != null)

+		{

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

 			viewFontStyle.setFontName(fontData.getName());

 			viewFontStyle.setFontHeight(fontData.getHeight());

 			viewFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);

 			viewFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);

+

 			org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter.getColor(store, fontColorConstant);

 			viewFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB).intValue());

 		}

@@ -2853,15 +2989,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

 		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

 		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

+

+

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

-		FillStyle fillStyle = (FillStyle) view.getStyle(NotationPackage.Literals.FILL_STYLE);

-		fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());

+

+

+		FillStyle fillStyle = (FillStyle) view

+				.getStyle(NotationPackage.Literals.FILL_STYLE);

+		fillStyle

+				.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue());

+

 		;

 		if (store.getBoolean(gradientPolicyConstant)) {

-			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(gradientColorConstant));

+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(

+					store.getString(gradientColorConstant));

 			fillStyle.setGradient(gradientPreferenceConverter.getGradientData());

-			fillStyle.setTransparency(gradientPreferenceConverter.getTransparency());

+			fillStyle

+					.setTransparency(gradientPreferenceConverter.getTransparency());

 		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
index 66cdd8e29bd..8a4803aedee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
@@ -26,7 +26,7 @@ public class UMLPropertySection extends DefaultPropertySection implements IPrope
 	 */

 	@Override

 	protected Object transformSelection(Object selected) {

-		selected = /* super. */transformSelectionToDomain(selected);

+		selected = /*super.*/transformSelectionToDomain(selected);

 		return selected;

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
index 6fa6727d668..3f34fedd6e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
@@ -75,11 +75,13 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr
 		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.

 		while (view != null) {

 			int vid = UMLVisualIDRegistry.getVisualID(view);

-			IElementType etype = UMLElementTypes.getElementType(vid);

+			IElementType etype =

+					UMLElementTypes.getElementType(vid);

 			if (etype != null) {

 				return etype;

 			}

-			view = view.eContainer() instanceof View ? (View) view.eContainer() : null;

+			view = view.eContainer() instanceof View ?

+					(View) view.eContainer() : null;

 		}

 		return null;

 	}